commit 1d48712c286981d56c1b3c56b3fc38adc31a1343 Merge: 9d24a352c f6ecda840 Author: Nick Mathewson <ni...@torproject.org> Date: Tue Aug 1 11:21:19 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug18100 | 5 +++++
src/or/connection_edge.c | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
