commit 48a6816eb591c6f2a89963bba3d827d845481a0e Merge: 65a65ed b17bb54 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 31 18:39:27 2012 -0400

Merge remote-tracking branch 'origin/maint-0.2.3'

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