[tor-commits] [tor/master] Merge branch 'bug9213_doc_024' into maint-0.2.4

[nickm at torproject.org]

commit 48578e1512f2d5fa95e4fdde0564d2db8ee7f995
Merge: 24e0b10 a68e6ea
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 1 20:59:13 2014 -0400

    Merge branch 'bug9213_doc_024' into maint-0.2.4

 changes/bug9213_doc |    5 +++++
 doc/tor.1.txt       |    5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)