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

[nickm at torproject.org]

commit fd8f21e730ff2f9f8ace9951bf17fe357a0f8a27
Merge: ab4b296 403c6ae
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Oct 19 15:40:07 2014 -0400

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

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