commit d04bf66120420e89ddb479316f4026869abc9154 Merge: 93d3a91 b14ac10 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 18 14:50:22 2012 -0500 Merge branch 'bug4012_023_squashed' changes/bug4012 | 8 ++++++++ doc/tor.1.txt | 29 +++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-)