commit 2ba047f596e401b294e356e8b89b70cde10c0948
Merge: 6520ef5 7a45ef5
Author: Nick Mathewson <[email protected]>
Date: Thu Nov 3 15:44:40 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
changes/bug19969 | 10 ++++++++++
src/or/connection_edge.c | 9 +++++++++
src/or/main.c | 31 +++++++++++++++++++++++--------
src/or/main.h | 2 ++
4 files changed, 44 insertions(+), 8 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
