[tor-commits] [tor/release-0.2.3] Merge branch 'bug6732' into maint-0.2.3

[arma at torproject.org]

commit b17bb543dab3e34f5076649707bc74d5d3bd62fd
Merge: a7a4bbf 774979c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 31 18:39:11 2012 -0400

    Merge branch 'bug6732' into maint-0.2.3

 changes/bug6732 |    3 +++
 doc/tor.1.txt   |   11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletions(-)