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

[nickm at torproject.org]

commit 6773102c92e7bd9d949251da75bcc0762e754ab2
Merge: d8ac7d557 0941c8bfe
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Apr 22 19:44:27 2018 -0400

    Merge branch 'bug25691_033_again_squashed'

 changes/bug25691_again    |  6 +++++
 src/or/circuitbuild.c     | 67 ++++++++++++++++++++++++-----------------------
 src/or/circuituse.c       |  4 +--
 src/or/control.c          |  9 ++++---
 src/or/entrynodes.c       |  7 ++---
 src/or/hs_common.c        | 15 ++++++++---
 src/or/nodelist.c         | 39 ++++++++++++++++++++++++---
 src/or/nodelist.h         |  4 ++-
 src/or/rendservice.c      |  2 +-
 src/or/routerlist.c       |  6 ++---
 src/test/test_hs.c        |  1 +
 src/test/test_hs_common.c |  3 ++-
 12 files changed, 108 insertions(+), 55 deletions(-)