commit 2504c2d4ae5b5f37be35b95c20dc0ee40dd3c3cd
Merge: e31487b4e e0bbef48b
Author: Nick Mathewson <[email protected]>
Date: Wed Mar 28 14:23:06 2018 -0400
Merge branch 'maint-0.3.3' into release-0.3.3
changes/bug24767 | 5 +
src/or/connection_or.c | 225 +++++++++++++++++++++++++++++++++++++++++++++
src/or/connection_or.h | 5 +
src/or/nodelist.c | 4 +-
src/or/nodelist.h | 2 +-
src/test/test_connection.c | 97 +++++++++++++++++++
6 files changed, 335 insertions(+), 3 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
