commit 81f50583d07fa3d61cb3c94366ce2b40d6af54e0 Merge: 1ca5216 5c9a88d Author: Jacob Appelbaum jacob@appelbaum.net Date: Sat Jan 26 20:01:49 2013 -0800

Merge branch 'debian-patches' into pending-changes

src/torsocks.in | 9 ++++++++- src/usewithtor.in | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-)