[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

[nickm@xxxxxxxxxxxxxx]

commit 9f5cb527f03cfe7aeabdd21abdbe223bded7d9f1
Merge: 20e3ae3 def41e9
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sun Nov 6 20:24:36 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/20460          | 4 ++++
 src/test/test_tortls.c | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

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