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

[nickm at torproject.org]

commit b53ff8606714c2f94d251a40c1a073bca760495e
Merge: 089ee13 4328525
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 8 09:43:25 2015 -0500

    Merge branch 'maint-0.2.5' into maint-0.2.6

 changes/bug17781 |    3 +++
 1 file changed, 3 insertions(+)