commit deaf30a8af331bdb96fae59a6f4a1effcb21e2d6 Merge: 6652477 9ad5b25 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jul 16 11:22:41 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6387 | 3 +++ doc/tor.1.txt | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-)