commit 7e9b6a19d4cdc605039f4e0107cbd5f4781fe150 Merge: 26639b7 4740d2e Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 18 15:07:02 2013 -0400

Merge remote-tracking branch 'public/bug8290' into maint-0.2.4

changes/bug8290 | 9 +++++++++ contrib/include.am | 3 --- contrib/tor-tsocks.conf | 13 ------------- doc/tor.1.txt | 2 +- doc/torify.1.txt | 18 +++--------------- 5 files changed, 13 insertions(+), 32 deletions(-)