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

[nickm at torproject.org]

commit 54eb3c043c1c7599a7cbd73321fba3476d49728b
Merge: 27e067df4 c525135da
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 5 15:35:43 2019 -0400

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

 changes/bug29034              |  5 ++++
 src/core/or/circuituse.c      | 12 ++++----
 src/feature/hs/hs_circuit.c   | 31 -------------------
 src/feature/hs/hs_circuit.h   |  1 -
 src/feature/rend/rendcommon.c | 11 -------
 src/feature/rend/rendcommon.h |  2 --
 src/test/include.am           |  1 -
 src/test/test.c               |  1 -
 src/test/test.h               |  1 -
 src/test/test_hs_circ.c       | 70 -------------------------------------------
 10 files changed, 11 insertions(+), 124 deletions(-)