commit f612a9eb1bfc32849f649d2071b9d4d9c9b51053 Merge: d1c4cf2 b9c8694 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Sep 19 08:26:07 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6024 | 2 ++ doc/tor.1.txt | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-)