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

[nickm at torproject.org]

commit 78295904f7422c056b5c61b31b512c6d5e2a225e
Merge: ae0cb94b6 7ed7fe230
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 24 10:56:50 2018 -0400

    Merge branch 'ticket26744'

 changes/ticket26744                                |    3 +
 src/core/include.am                                |   10 +-
 src/core/mainloop/connection.c                     |    2 +-
 src/core/mainloop/mainloop.c                       |    2 +-
 src/core/or/circuitbuild.c                         |    2 +-
 src/core/or/circuitlist.c                          |    2 +-
 src/core/or/circuituse.c                           |    2 +-
 src/core/or/connection_edge.c                      |    2 +-
 src/core/or/relay.c                                |    2 +-
 src/feature/client/bridges.c                       |    4 +-
 src/feature/client/entrynodes.c                    |    2 +-
 src/feature/control/control.c                      |    4 +-
 src/feature/dirauth/dirvote.c                      |    3 +-
 src/feature/dirauth/process_descs.c                |    3 +-
 src/feature/dircache/dircache.c                    | 1740 ++++++++++++
 src/feature/dircache/dircache.h                    |   43 +
 src/feature/dircache/directory.h                   |  347 ---
 src/feature/dircache/dirserv.c                     |    2 +-
 .../directory.c => dirclient/dirclient.c}          | 2961 +-------------------
 src/feature/dirclient/dirclient.h                  |  172 ++
 src/feature/dirclient/dlstatus.c                   |  422 +++
 src/feature/dirclient/dlstatus.h                   |   58 +
 src/feature/dircommon/directory.c                  |  651 +++++
 src/feature/dircommon/directory.h                  |  129 +
 src/feature/hs/hs_client.c                         |    3 +-
 src/feature/hs/hs_service.c                        |    3 +-
 src/feature/nodelist/authcert.c                    |    4 +-
 src/feature/nodelist/dirlist.c                     |    2 +-
 src/feature/nodelist/microdesc.c                   |    3 +-
 src/feature/nodelist/networkstatus.c               |    4 +-
 src/feature/nodelist/node_select.c                 |    3 +-
 src/feature/nodelist/routerlist.c                  |    4 +-
 src/feature/relay/router.c                         |    3 +-
 src/feature/rend/rendclient.c                      |    3 +-
 src/feature/rend/rendservice.c                     |    3 +-
 src/test/fuzz/fuzz_http.c                          |    5 +-
 src/test/test_connection.c                         |    2 +-
 src/test/test_dir.c                                |    8 +-
 src/test/test_dir_handle_get.c                     |    4 +-
 src/test/test_entrynodes.c                         |    5 +-
 src/test/test_hs_cache.c                           |    6 +-
 src/test/test_hs_client.c                          |    2 +-
 src/test/test_hs_common.c                          |    2 +-
 src/test/test_oos.c                                |    2 +-
 src/test/test_routerlist.c                         |    5 +-
 45 files changed, 3391 insertions(+), 3253 deletions(-)