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

[nickm at torproject.org]

commit eeb9751eadd148e5077cedb28f75e756b47281c0
Merge: e9bf584 b53ff86
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 8 09:43:42 2015 -0500

    Merge branch 'maint-0.2.6' into maint-0.2.7

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