[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket17242_032_03-squashed'

[nickm at torproject.org]

commit 91c6bc160b1d2be60e5756f13d28ba469049351c
Merge: b5c5086ab dc0264f65
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 24 15:12:16 2017 -0400

    Merge remote-tracking branch 'dgoulet/ticket17242_032_03-squashed'

 src/or/circuitlist.c                   |    7 +-
 src/or/circuitlist.h                   |    1 +
 src/or/circuituse.c                    |   42 +-
 src/or/connection.c                    |   21 +
 src/or/connection.h                    |    1 +
 src/or/connection_edge.c               |  313 +++++----
 src/or/connection_edge.h               |    3 +-
 src/or/control.c                       |    4 +-
 src/or/directory.c                     |  129 +++-
 src/or/directory.h                     |   18 +-
 src/or/hs_cache.c                      |  496 +++++++++++++-
 src/or/hs_cache.h                      |   60 ++
 src/or/hs_cell.c                       |  364 ++++++++++
 src/or/hs_cell.h                       |   47 ++
 src/or/hs_circuit.c                    |  318 +++++----
 src/or/hs_circuit.h                    |    5 +
 src/or/hs_circuitmap.c                 |   52 +-
 src/or/hs_circuitmap.h                 |    8 +
 src/or/hs_client.c                     | 1181 +++++++++++++++++++++++++++++++-
 src/or/hs_client.h                     |   34 +
 src/or/hs_common.c                     |  374 +++++++++-
 src/or/hs_common.h                     |   24 +
 src/or/hs_descriptor.c                 |  146 ++--
 src/or/hs_descriptor.h                 |   14 +-
 src/or/hs_ident.c                      |   22 +
 src/or/hs_ident.h                      |    3 +
 src/or/hs_service.c                    |  154 ++++-
 src/or/hs_service.h                    |   15 +
 src/or/main.c                          |    3 +-
 src/or/nodelist.c                      |   26 +-
 src/or/nodelist.h                      |    4 +-
 src/or/or.h                            |    5 +-
 src/or/rendcache.c                     |    4 +-
 src/or/rendclient.c                    |  362 +---------
 src/or/rendclient.h                    |    4 -
 src/or/rendcommon.c                    |   11 +-
 src/or/rendcommon.h                    |    4 +-
 src/or/rendservice.c                   |    2 +-
 src/or/shared_random_state.c           |    2 +-
 src/test/test.c                        |   17 -
 src/test/test_circuitlist.c            |   11 +
 src/test/test_entryconn.c              |   87 +++
 src/test/test_hs_cache.c               |   66 ++
 src/test/test_hs_common.c              |  395 ++++++++++-
 src/test/test_hs_service.c             |   19 +-
 src/trunnel/hs/cell_rendezvous.c       |  178 +++++
 src/trunnel/hs/cell_rendezvous.h       |   69 ++
 src/trunnel/hs/cell_rendezvous.trunnel |   13 +-
 48 files changed, 4371 insertions(+), 767 deletions(-)