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

[nickm at torproject.org]

commit 095080360f1511d35fc62be8bc7c804fbcccbdc3
Merge: 9ffb2d8 fd8f21e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Oct 19 21:38:17 2014 -0400

    Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug13471 |    5 +++++
 1 file changed, 5 insertions(+)