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

[nickm at torproject.org]

commit 48632455a5bd679d5f97c5137f24f91e564abad6
Merge: b1d32a922 8f13c3d3e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 28 16:02:04 2018 -0400

    Merge branch 'bug26367_035_01'

 changes/bug26367                 |  5 +++
 configure.ac                     |  7 ---
 doc/tor.1.txt                    | 28 +-----------
 src/app/config/config.c          | 64 ++-------------------------
 src/app/config/or_options_st.h   | 14 ++----
 src/core/or/channel.c            |  7 ---
 src/core/or/channelpadding.c     | 16 -------
 src/core/or/channelpadding.h     |  2 -
 src/core/or/circuitbuild.c       | 96 ++--------------------------------------
 src/core/or/circuitbuild.h       |  8 +---
 src/core/or/circuitstats.c       |  8 ++--
 src/core/or/circuituse.c         | 42 +++---------------
 src/core/or/connection_edge.c    | 12 -----
 src/core/or/or.h                 |  4 --
 src/feature/dircache/directory.c |  6 +--
 src/feature/rend/rendclient.c    | 37 ----------------
 src/feature/rend/rendclient.h    |  3 --
 src/feature/rend/rendcommon.c    | 22 +++------
 src/feature/rend/rendmid.c       |  2 +-
 src/test/test_channelpadding.c   | 73 +-----------------------------
 src/test/test_hs.c               | 75 -------------------------------
 src/test/test_options.c          | 52 +---------------------
 22 files changed, 41 insertions(+), 542 deletions(-)