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

[nickm at torproject.org]

commit d018bf199c9e566202eef0bb7fb68c2567c4a25e
Merge: 4cf6b67f5 d8509b450
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 1 10:29:05 2018 -0400

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

 Makefile.am                                |   6 +-
 configure.ac                               |  25 +
 src/or/circuitstats.c                      |   3 +-
 src/or/config.c                            |   3 +-
 src/or/control.c                           |   2 +-
 src/or/{ => dirauth}/dircollate.c          |   0
 src/or/{ => dirauth}/dircollate.h          |   0
 src/or/{ => dirauth}/dirvote.c             | 988 +++++++++++++++++++++--------
 src/or/{ => dirauth}/dirvote.h             | 199 +++---
 src/or/{ => dirauth}/shared_random.c       | 167 +----
 src/or/{ => dirauth}/shared_random.h       |  39 +-
 src/or/{ => dirauth}/shared_random_state.c |  84 +--
 src/or/{ => dirauth}/shared_random_state.h |   5 -
 src/or/directory.c                         |  53 +-
 src/or/dirserv.c                           | 575 +----------------
 src/or/dirserv.h                           |  15 +-
 src/or/dirvote_common.c                    | 195 ++++++
 src/or/dirvote_common.h                    |  66 ++
 src/or/hs_common.c                         |   4 +-
 src/or/hs_service.c                        |   2 +-
 src/or/include.am                          |  41 +-
 src/or/main.c                              |   5 +-
 src/or/networkstatus.c                     |  28 +-
 src/or/networkstatus.h                     |   3 +
 src/or/routerlist.c                        |   3 +-
 src/or/routerparse.c                       |  71 +--
 src/or/shared_random_common.c              | 259 ++++++++
 src/or/shared_random_common.h              |  47 ++
 src/test/test_config.c                     |   2 +-
 src/test/test_dir.c                        |   4 +-
 src/test/test_dir_common.c                 |   3 +-
 src/test/test_dir_handle_get.c             |   2 +-
 src/test/test_hs_common.c                  |   4 +-
 src/test/test_hs_service.c                 |   4 +-
 src/test/test_microdesc.c                  |   3 +-
 src/test/test_routerlist.c                 |   4 +-
 src/test/test_shared_random.c              |   7 +-
 37 files changed, 1610 insertions(+), 1311 deletions(-)