commit a7b6c01468171096f9e4b6262771c85511e0e4e7 Merge: f9a243a9d 0bb879e82 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 13 11:09:17 2019 -0500

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

contrib/client-tools/tor-resolve.py | 5 +++++ scripts/codegen/fuzzing_include_am.py | 5 +++++ scripts/codegen/gen_server_ciphers.py | 5 +++++ scripts/codegen/get_mozilla_ciphers.py | 5 +++++ scripts/codegen/makedesc.py | 5 +++++ scripts/maint/add_c_file.py | 5 +++++ scripts/maint/annotate_ifdef_directives.py | 5 +++++ scripts/maint/checkIncludes.py | 5 +++++ scripts/maint/format_changelog.py | 4 ++++ scripts/maint/lintChanges.py | 5 ++++- scripts/maint/locatemissingdoxygen.py | 5 +++++ scripts/maint/practracker/includes.py | 4 +++- scripts/maint/practracker/metrics.py | 5 +++++ scripts/maint/practracker/practracker.py | 3 +++ scripts/maint/practracker/practracker_tests.py | 5 +++++ scripts/maint/practracker/problem.py | 3 +++ scripts/maint/practracker/util.py | 5 +++++ scripts/maint/rectify_include_paths.py | 5 +++++ scripts/maint/redox.py | 11 ++++++++--- scripts/maint/rename_c_identifier.py | 5 +++++ scripts/maint/sortChanges.py | 4 ++++ scripts/maint/update_versions.py | 3 +++ scripts/test/appveyor-irc-notify.py | 4 +++- src/config/mmdb-convert.py | 5 +++++ src/ext/ed25519/ref10/base.py | 5 +++++ src/ext/ed25519/ref10/base2.py | 5 +++++ src/ext/ed25519/ref10/d.py | 5 +++++ src/ext/ed25519/ref10/d2.py | 5 +++++ src/ext/ed25519/ref10/sqrtm1.py | 5 +++++ src/test/bt_test.py | 4 ++++ src/test/ed25519_exts_ref.py | 5 +++++ src/test/hs_build_address.py | 5 +++++ src/test/hs_indexes.py | 5 +++++ src/test/hs_ntor_ref.py | 5 +++++ src/test/ntor_ref.py | 5 +++++ src/test/ope_ref.py | 5 +++++ src/test/slow_ed25519.py | 5 +++++ src/test/slownacl_curve25519.py | 7 ++++++- src/test/sr_commit_calc_ref.py | 5 +++++ src/test/sr_srv_calc_ref.py | 5 +++++ src/test/test_rebind.py | 3 +++ 41 files changed, 193 insertions(+), 7 deletions(-)