commit ae7cb3349e8a159c3144e7d3ea66b9a439d7028e Merge: ab18e5e5f c527cde82 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 7 08:35:35 2017 -0400

Merge branch 'bug23361_032_01_squashed2'

src/or/circuitbuild.c | 28 ++++++++++++++++++++++------ src/or/circuitlist.c | 32 ++++++++++++++++++++++++++++++++ src/or/circuituse.c | 10 ++++++++++ src/or/circuituse.h | 3 +++ src/or/hs_client.c | 17 +++++++++++++++-- src/or/nodelist.c | 22 ++++++++++++++++++++++ src/or/nodelist.h | 1 + src/or/or.h | 10 +++++++++- src/or/protover.h | 2 ++ src/or/routerlist.c | 16 ++++++++++++---- src/or/routerparse.c | 3 +++ 11 files changed, 131 insertions(+), 13 deletions(-)