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

[nickm@xxxxxxxxxxxxxx]

commit 05ec055c417c80bf7b13914fade70a72f11accc5
Merge: 332543b 51675f9
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 7 08:38:59 2017 -0500

    Merge branch 'maint-0.2.4' into maint-0.2.5

 changes/bug17404    | 6 ++++++
 src/common/tortls.c | 4 ++++
 2 files changed, 10 insertions(+)




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