[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'

commit e6d61ee59430162fd7b820278f3dfa1677ad81d8 Merge: 1049d31 d9bd0de Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jul 31 10:18:05 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6500 | 2 ++ doc/tor.1.txt | 4 ++-- doc/torify.1.txt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-)