[tor-commits] [tor/master] Merge branch 'bug2865'

[nickm at torproject.org]

commit cb01aaea12b5ed217a1af2595aa9d658c4a52709
Merge: 8be6058 2d127ea
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 11 09:53:49 2012 -0400

    Merge branch 'bug2865'

 changes/bug2865 |    4 ++
 doc/tor.1.txt   |   88 +++++++++++++++++++++++++++---------------------------
 2 files changed, 48 insertions(+), 44 deletions(-)