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

[nickm at torproject.org]

commit 403c6ae78e2dff753d407273ce78c024a0ffb40d
Merge: 943fd4a c1dd598
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Oct 19 15:39:48 2014 -0400

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

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