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

[nickm at torproject.org]

commit 01fdc3240f59f2d9a682b3c2a2d58db01d0bd7a3
Merge: 17c63ff9f ceacda44f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 16 16:42:01 2020 -0500

    Merge branch 'ticket32695_squashed'

 changes/ticket32695                     |  6 +++
 src/core/or/policies.c                  | 56 +-------------------
 src/feature/dirauth/dirvote.c           | 21 ++------
 src/feature/dirauth/dirvote.h           | 26 +--------
 src/feature/nodelist/fmt_routerstatus.c | 11 ----
 src/feature/nodelist/fmt_routerstatus.h |  1 -
 src/feature/nodelist/networkstatus.c    | 27 ----------
 src/feature/nodelist/networkstatus.h    |  1 -
 src/test/test_dir.c                     | 93 ---------------------------------
 9 files changed, 12 insertions(+), 230 deletions(-)

diff --cc src/test/test_dir.c
index 6430b5871,f16b054c6..76c86c258
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@@ -7593,12 -7203,6 +7501,11 @@@ struct testcase_t dir_tests[] = 
    DIR(matching_flags, 0),
    DIR(networkstatus_compute_bw_weights_v10, 0),
    DIR(platform_str, 0),
-   DIR(networkstatus_consensus_has_ipv6, TT_FORK),
    DIR(format_versions_list, TT_FORK),
 +  DIR(add_fingerprint, TT_FORK),
 +  DIR(dirserv_load_fingerprint_file, TT_FORK),
 +  DIR(dirserv_router_get_status, TT_FORK),
 +  DIR(dirserv_would_reject_router, TT_FORK),
 +  DIR(dirserv_add_own_fingerprint, TT_FORK),
    END_OF_TESTCASES
  };