commit 72b802001c83d6e2fae765dc355e937d213217b8 Merge: fde18fed6 039206086 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 14 09:49:11 2017 -0400

Merge remote-tracking branch 'catalyst-oniongit/skew'

changes/bug23506 | 4 ++ src/or/connection.c | 9 +++- src/or/connection_or.c | 8 ++-- src/or/control.c | 102 ++++++++++++++++++++++++++++++---------------- src/or/control.h | 4 +- src/or/networkstatus.c | 6 ++- src/test/test_extorport.c | 16 ++++---- 7 files changed, 97 insertions(+), 52 deletions(-)