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

[nickm at torproject.org]

commit beec881f92d25b4e85aa30be341d30fce54b2e50
Merge: 4d7ac69 c03cfc0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 5 11:20:45 2013 -0400

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

 doc/tor.1.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)