commit e7ae055b48ee96af8391c826df38853b42e32fb9 Merge: 67f27ae 1e810b6 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 15 14:23:12 2020 -0400
Merge branch 'ticket34447_v2'
networks/basic-025 | 8 ---- networks/basic-100 | 10 ----- networks/basic-min-mixed | 47 --------------------- networks/bridges | 14 ------ networks/bridges+hs | 19 --------- networks/bridges+hs-v2 | 19 --------- networks/bridges+ipv6 | 21 --------- networks/bridges+ipv6+hs | 24 ----------- networks/bridges+ipv6+hs-v2 | 24 ----------- networks/bridges+ipv6+hs-v23 | 25 ----------- networks/bridges-obfs2 | 15 ------- networks/bridges-obfs4 | 39 ----------------- networks/bwfile | 9 ---- networks/bwscanner | 10 ----- networks/client-ipv6-only | 22 ---------- networks/client-ipv6-only-md | 22 ---------- networks/hs | 11 ----- networks/hs-025 | 10 ----- networks/hs-100 | 12 ------ networks/hs-100-clients | 13 ------ networks/hs-client-ipv6 | 25 ----------- networks/hs-client-ipv6-md | 25 ----------- networks/hs-exit-min | 11 ----- networks/hs-intro | 39 ----------------- networks/hs-ipv6 | 26 ------------ networks/hs-ipv6-md | 26 ------------ networks/hs-min | 17 -------- networks/hs-min-mixed | 61 --------------------------- networks/hs-single-onion-v23-exit-min | 19 --------- networks/hs-v2-min | 5 ++- networks/hs-v23-exit-min | 15 ------- networks/hs-v23-ipv6 | 27 ------------ networks/hs-v23-ipv6-md | 5 ++- networks/hs-v23-min | 5 ++- networks/hs-v3-intro | 18 -------- networks/hs-v3-ipv6-md | 26 ------------ networks/hs-v3-min | 5 ++- networks/middle | 11 ----- networks/middle-025 | 11 ----- networks/middle-100 | 13 ------ networks/mixed | 16 ------- networks/mixed+hs-v2 | 22 ---------- networks/mixed+hs-v23-ipv6 | 4 +- networks/mixed+hs-v3 | 19 --------- networks/single-onion | 17 -------- networks/single-onion-client-ipv6 | 25 ----------- networks/single-onion-client-ipv6-md | 25 ----------- networks/single-onion-indirect | 20 --------- networks/single-onion-ipv6 | 26 ------------ networks/single-onion-ipv6-md | 26 ------------ networks/single-onion-v23 | 5 ++- networks/single-onion-v23-ipv6 | 28 ------------ networks/single-onion-v23-ipv6-md | 5 ++- networks/single-onion-v3 | 17 -------- networks/single-onion-v3-ipv6 | 26 ------------ networks/single-onion-v3-ipv6-md | 26 ------------ torrc_templates/authority-bwfile.tmpl | 2 - torrc_templates/authority-exit.tmpl | 2 - torrc_templates/authority-orport-v6-exit.tmpl | 7 --- torrc_templates/bridge-obfs2.tmpl | 6 --- torrc_templates/bridge-obfs4.tmpl | 6 --- torrc_templates/bridgeauthority-exit.tmpl | 2 - torrc_templates/bridgeclient-obfs2.tmpl | 3 -- torrc_templates/bridgeclient-obfs4.tmpl | 3 -- torrc_templates/client-only-v6.i | 6 --- torrc_templates/client-only-v6.tmpl | 2 - torrc_templates/client-use-v6.i | 3 -- torrc_templates/client-use-v6.tmpl | 2 - torrc_templates/hs-only-v6.tmpl | 3 -- torrc_templates/hs-use-v6.tmpl | 3 -- torrc_templates/hs-v3-10.tmpl | 2 - torrc_templates/hs-v3-only-v6.tmpl | 3 -- torrc_templates/hs-v3-use-v6.tmpl | 3 -- torrc_templates/hs0.tmpl | 2 - torrc_templates/hs1.tmpl | 2 - torrc_templates/hs10.tmpl | 2 - torrc_templates/hs2.tmpl | 2 - torrc_templates/hs3.tmpl | 2 - torrc_templates/hs4.tmpl | 2 - torrc_templates/hs5.tmpl | 2 - torrc_templates/hs6.tmpl | 2 - torrc_templates/hs7.tmpl | 2 - torrc_templates/hs8.tmpl | 2 - torrc_templates/hs9.tmpl | 2 - torrc_templates/relay-exit-v4-only.tmpl | 6 --- torrc_templates/relay-orport-v6-exit.tmpl | 10 ----- torrc_templates/single-onion-indirect.tmpl | 6 --- torrc_templates/single-onion-only-v6.tmpl | 3 -- torrc_templates/single-onion-use-v6.tmpl | 3 -- torrc_templates/single-onion-v3-indirect.tmpl | 6 --- torrc_templates/single-onion-v3-only-v6.tmpl | 3 -- torrc_templates/single-onion-v3-use-v6.tmpl | 3 -- 92 files changed, 27 insertions(+), 1164 deletions(-)