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

commit 72acdfe13465939150cb61943b23495ec85e9441 Merge: 4cbd6e4 f5e86bc Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jun 18 12:01:56 2012 -0400 Merge branch 'bug4748_squashed' changes/bug4748 | 4 +++ doc/tor.1.txt | 65 +++++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 58 insertions(+), 11 deletions(-)