commit 82ce43a70676013eb4b694465a826b9d469905aa Merge: 2cdd631 dc60b5d Author: Nick Mathewson nickm@torproject.org Date: Wed May 16 11:33:52 2012 -0400

Merge remote-tracking branch 'public/bug3964'

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