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

[nickm@xxxxxxxxxxxxxx]

commit 06f1bb5954edd6c5cf7d7beb59e044f7f0dfbb9c
Merge: 473725a63 eecfed0cd
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Dec 11 16:56:31 2017 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug24167    | 7 +++++++
 src/or/connection.c | 4 ++++
 2 files changed, 11 insertions(+)

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