commit e0bbef48bf414574a9e1342accfd2fe0d2a5343e Merge: 3cc382b93 ab16f1e2a Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 28 14:21:04 2018 -0400

Merge remote-tracking branch 'dgoulet/bug24767_033_03' into 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(-)