[tor-commits] [tor/master] Merge branch 'bug23576-041-rebased-squashed'

[nickm at torproject.org]

commit 61adcb22c53843c0fd12125d1a388dcd7b7e7df7
Merge: c01c6123f 680b2afd8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 12 11:10:01 2019 -0400

    Merge branch 'bug23576-041-rebased-squashed'

 changes/bug22781                 |   4 +
 changes/bug23576                 |   7 ++
 changes/bug29243                 |   3 +
 src/feature/hs/hs_cell.c         |   9 +-
 src/feature/hs/hs_circuit.c      |  86 +------------------
 src/feature/hs/hs_client.c       |  21 ++---
 src/feature/hs/hs_common.c       |  75 ++++++++++++-----
 src/feature/hs/hs_common.h       |   4 +-
 src/feature/hs/hs_descriptor.c   | 178 +++------------------------------------
 src/feature/hs/hs_descriptor.h   |  29 +------
 src/feature/hs/hs_intropoint.c   |   4 +-
 src/feature/hs/hs_service.c      | 146 +++++++++-----------------------
 src/feature/hs/hs_service.h      |   5 +-
 src/feature/nodelist/nodelist.c  |  96 +++++++++++++++++++++
 src/feature/nodelist/nodelist.h  |   5 ++
 src/test/hs_test_helpers.c       |  89 ++++++++++++++------
 src/test/test_hs_cell.c          |   4 +-
 src/test/test_hs_client.c        |   4 +
 src/test/test_hs_descriptor.c    | 111 ------------------------
 src/test/test_hs_intropoint.c    |   4 +-
 src/test/test_hs_service.c       |  22 ++---
 src/trunnel/ed25519_cert.trunnel |   6 --
 22 files changed, 332 insertions(+), 580 deletions(-)