[tor-commits] [tor/master] Merge branch 'bug23577_squashed'

[nickm at torproject.org]

commit f92736517baa2f19b0ff3827684f11b1b1f29ffd
Merge: 11eaf208c fb718e991
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Nov 12 17:05:39 2017 -0500

    Merge branch 'bug23577_squashed'

 changes/ticket23577 |  7 +++++
 src/or/hs_circuit.c | 81 ++++++++++++++++++++++++++++++++++-------------------
 src/or/nodelist.c   | 12 ++++++++
 src/or/nodelist.h   |  1 +
 4 files changed, 72 insertions(+), 29 deletions(-)