privoxy: merge r29151, r29805
authorJo-Philipp Wich <[email protected]>
Sun, 5 Feb 2012 15:56:03 +0000 (15:56 +0000)
committerJo-Philipp Wich <[email protected]>
Sun, 5 Feb 2012 15:56:03 +0000 (15:56 +0000)
commit841810021021f0c84e24139b9c0cfacd825388ca
treea83e7cc01a8431713ed2f7e78f41e6b11cff8116
parent945f4688022539266b48d25e2a3b6f5ec38c2195
privoxy: merge r29151, r29805

SVN-Revision: 30241
net/privoxy/Makefile
net/privoxy/files/privoxy.init