commit 794a25f8c11971cf71f472820c2d3cd6a0f29b94 Merge: a3c1d78c2 e0bbef48b Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 28 14:23:06 2018 -0400

Merge branch 'maint-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(-)