[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/315'

commit 5a2374b0740ce662e4b323f104c8ff58164d996a Merge: 902b34a0d 617160895 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 11 15:55:30 2018 -0400

Merge remote-tracking branch 'tor-github/pr/315'

changes/ticket27169 | 6 ++ src/core/or/circuitbuild.c | 12 ++-- src/core/or/connection_or.c | 1 + src/core/or/relay.c | 4 +- src/feature/control/control.c | 139 ++++++++++++++++++++++++++------------ src/feature/control/control.h | 4 +- src/feature/dircache/directory.c | 8 +-- src/feature/nodelist/nodelist.c | 9 ++- src/test/test_controller_events.c | 68 +++++++++++++++++++ 9 files changed, 187 insertions(+), 64 deletions(-)