[tor-commits] [tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5

[nickm at torproject.org]

commit 06e8f4b370b4ddf096482dafb64ad7f394cbd28a
Merge: 475c95f dcb4ee5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 3 13:46:31 2014 -0400

    Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5

 doc/tor.1.txt |    5 +++++
 1 file changed, 5 insertions(+)