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

[nickm@xxxxxxxxxxxxxx]

commit ef7df109720b80a534f187099e834e9a8d0ecb88
Merge: b236e18 8b93cbc
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Dec 2 12:01:00 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug20716    |  3 +++
 src/or/connection.c | 11 +++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

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