commit 0ee524b57f35460229725c7a43f28ab73bfaa3fa Merge: 29f1ffa b04dca4 Author: Nick Mathewson nickm@torproject.org Date: Wed May 4 17:37:56 2011 -0400

Merge branch 'bug2379' into maint-0.2.2

changes/bug2379 | 5 +++++ doc/tor.1.txt | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-)