[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1531'

[nickm at torproject.org]

commit a76b7cd8b5da9951e5e446846ef4e3d9ec6b1453
Merge: 3b4a360ed 9f37c0f4f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 14 09:58:37 2019 -0500

    Merge remote-tracking branch 'tor-github/pr/1531'

 changes/bug32468                                   |   3 +
 changes/ticket32451                                |   5 +
 .../badnick_1/expected_log_no_dirauth_relay        |   1 +
 .../badnick_2/expected_log_no_dirauth_relay        |   1 +
 src/test/conf_examples/bridgeauth_1/expected_log   |   1 +
 .../expected_log_no_dirauth_relay                  |   1 +
 src/test/conf_examples/crypto_accel/expected_log   |   1 +
 .../error_nss => crypto_accel/expected_log_nss}    |   0
 src/test/conf_examples/crypto_accel/expected_nss   |   2 +
 .../crypto_accel_req/expected_log_nss              |   1 +
 src/test/conf_examples/dirauth_1/expected_log      |   1 +
 src/test/conf_examples/empty_1/expected_log        |   1 +
 src/test/conf_examples/empty_2/expected_log        |   1 +
 src/test/conf_examples/empty_3/expected_log        |   1 +
 src/test/conf_examples/example_1/expected_log      |   1 +
 src/test/conf_examples/example_3/expected_log      |   1 +
 src/test/conf_examples/include_1/expected_log      |   1 +
 .../conf_examples/include_bug_31408/expected_log   |   1 +
 src/test/conf_examples/large_1/expected_log        |   1 +
 .../conf_examples/{pt_02 => lzma_zstd_1}/expected  |   0
 .../lzma_zstd_1/{error => expected_log}            |   0
 .../lzma_zstd_1/{error_lzma => expected_log_lzma}  |   0
 .../{error_lzma_zstd => expected_log_lzma_zstd}    |   0
 .../lzma_zstd_1/{error_zstd => expected_log_zstd}  |   0
 .../{pt_09/expected => lzma_zstd_1/expected_lzma}  |   0
 .../expected => lzma_zstd_1/expected_lzma_zstd}    |   0
 src/test/conf_examples/lzma_zstd_1/expected_zstd   |   0
 src/test/conf_examples/lzma_zstd_1/torrc           |   5 +-
 src/test/conf_examples/nss_1/expected              |   0
 .../conf_examples/nss_1/{error => expected_log}    |   0
 src/test/conf_examples/nss_1/expected_log_nss      |   1 +
 src/test/conf_examples/nss_1/expected_nss          |   0
 src/test/conf_examples/nss_1/torrc                 |   5 +-
 src/test/conf_examples/obsolete_1/expected_log     |   1 +
 src/test/conf_examples/obsolete_1/torrc            | 136 +++---
 src/test/conf_examples/obsolete_2/expected_log     |   1 +
 src/test/conf_examples/obsolete_2/torrc            |   3 +
 src/test/conf_examples/obsolete_3/expected         |   0
 src/test/conf_examples/obsolete_3/expected_log     |   1 +
 src/test/conf_examples/obsolete_3/torrc            |   4 +
 src/test/conf_examples/ops_1/expected_log          |   1 +
 src/test/conf_examples/ops_2/expected_log          |   1 +
 src/test/conf_examples/ops_3/expected_log          |   1 +
 src/test/conf_examples/ops_4/expected_log          |   1 +
 src/test/conf_examples/ops_5/expected_log          |   1 +
 src/test/conf_examples/ops_6/expected_log          |   1 +
 src/test/conf_examples/pt_01/expected_log          |   1 +
 src/test/conf_examples/pt_02/error                 |   1 +
 .../pt_02/expected_log_no_dirauth_relay            |   1 +
 src/test/conf_examples/pt_03/expected_log          |   1 +
 .../pt_03/expected_log_no_dirauth_relay            |   1 +
 .../conf_examples/pt_03/expected_no_dirauth_relay  |   1 +
 src/test/conf_examples/pt_04/expected_log          |   1 +
 .../pt_04/expected_log_no_dirauth_relay            |   1 +
 .../conf_examples/pt_04/expected_no_dirauth_relay  |   3 +
 src/test/conf_examples/pt_05/expected_log          |   1 +
 src/test/conf_examples/pt_06/expected_log          |   1 +
 .../pt_06/expected_log_no_dirauth_relay            |   1 +
 .../conf_examples/pt_06/expected_no_dirauth_relay  |   6 +
 src/test/conf_examples/pt_07/expected_log          |   1 +
 .../pt_08/expected_log_no_dirauth_relay            |   1 +
 src/test/conf_examples/pt_09/error                 |   1 +
 src/test/conf_examples/relay_01/expected_log       |   1 +
 src/test/conf_examples/relay_02/error              |   1 +
 src/test/conf_examples/relay_03/expected_log       |   1 +
 src/test/conf_examples/relay_04/expected_log       |   1 +
 src/test/conf_examples/relay_05/expected_log       |   1 +
 src/test/conf_examples/relay_06/expected_log       |   1 +
 src/test/conf_examples/relay_07/expected_log       |   1 +
 src/test/conf_examples/relay_08/expected_log       |   1 +
 src/test/conf_examples/relay_09/expected_log       |   1 +
 src/test/conf_examples/relay_10/expected_log       |   1 +
 src/test/conf_examples/relay_14/expected_log       |   1 +
 src/test/conf_examples/relay_17/expected_log       |   1 +
 src/test/conf_examples/relay_19/expected_log       |   1 +
 src/test/conf_examples/relay_21/expected_log       |   1 +
 src/test/conf_examples/relay_29/expected_log       |   1 +
 src/test/conf_failures/README                      |   5 +
 src/test/conf_failures/fail-error-success/error    |   1 +
 src/test/conf_failures/fail-error-success/torrc    |   0
 src/test/conf_failures/fail-error/error            |   1 +
 src/test/conf_failures/fail-error/torrc            |   1 +
 .../conf_failures/fail-expected-error/expected     |   0
 src/test/conf_failures/fail-expected-error/torrc   |   1 +
 src/test/conf_failures/fail-expected-log/expected  |   0
 .../conf_failures/fail-expected-log/expected_log   |   1 +
 src/test/conf_failures/fail-expected-log/torrc     |   0
 src/test/conf_failures/fail-expected/expected      |   1 +
 src/test/conf_failures/fail-expected/torrc         |   0
 src/test/test_parseconf.sh                         | 508 +++++++++++++++++----
 90 files changed, 573 insertions(+), 172 deletions(-)