commit 1bf377f4b68136a238d9e54d5b56169c9589b583 Merge: f07d8a1a9 3208a74f9 Author: David Goulet <dgoulet@torproject.org> Date: Thu Jan 30 14:06:09 2020 -0500 Merge branch 'tor-github/pr/1687' contrib/client-tools/tor-resolve.py | 10 +++++----- scripts/codegen/gen_server_ciphers.py | 14 +++++++------- scripts/codegen/get_mozilla_ciphers.py | 8 ++++---- scripts/codegen/makedesc.py | 15 ++++++++++----- scripts/maint/format_changelog.py | 2 +- scripts/maint/locatemissingdoxygen.py | 6 +++--- scripts/maint/redox.py | 17 +++++++++++------ src/ext/ed25519/ref10/base.py | 14 +++++++------- src/ext/ed25519/ref10/base2.py | 10 +++++----- src/ext/ed25519/ref10/d.py | 2 +- src/ext/ed25519/ref10/d2.py | 2 +- src/ext/ed25519/ref10/sqrtm1.py | 2 +- src/test/ed25519_exts_ref.py | 20 ++++++++++---------- 13 files changed, 66 insertions(+), 56 deletions(-)