commit 4a2347d2902c2688e766e4a83a5db69847b7b578 Merge: 42246f8c9 c11672820 Author: Nick Mathewson nickm@torproject.org Date: Wed May 6 16:55:41 2020 -0400

Merge branch 'maint-0.4.3'

Amazingly, this time we had no merge conflicts with "falls through" comments.

src/app/config/quiet_level.c | 2 +- src/core/or/channeltls.c | 2 +- src/core/or/circuitbuild.c | 2 +- src/core/or/circuitlist.c | 2 +- src/core/or/circuituse.c | 2 +- src/core/or/connection_edge.c | 6 ++-- src/core/or/crypt_path.c | 2 +- src/core/or/onion.c | 2 +- src/core/or/policies.c | 2 +- src/core/or/reasons.c | 2 +- src/core/or/relay.c | 2 +- src/core/or/scheduler.c | 4 +-- src/core/or/sendme.c | 2 +- src/core/proto/proto_socks.c | 4 +-- src/ext/csiphash.c | 14 ++++----- src/ext/ed25519/donna/modm-donna-32bit.h | 48 +++++++++++++++---------------- src/ext/ed25519/donna/modm-donna-64bit.h | 24 ++++++++-------- src/feature/client/entrynodes.c | 2 +- src/feature/control/control_cmd.c | 2 +- src/feature/dirclient/dirclient.c | 2 +- src/feature/dirparse/parsecommon.c | 2 +- src/feature/relay/dns.c | 2 +- src/feature/rend/rendclient.c | 2 +- src/lib/crypt_ops/crypto_digest_nss.c | 26 ++++++++--------- src/lib/crypt_ops/crypto_digest_openssl.c | 10 +++---- src/test/test_socks.c | 2 +- 26 files changed, 86 insertions(+), 86 deletions(-)