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

[nickm@xxxxxxxxxxxxxx]

commit eeb9751eadd148e5077cedb28f75e756b47281c0
Merge: e9bf584 b53ff86
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
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(+)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits