commit 78a72f8196505e28a5a823f24fdb74f36dc26845 Merge: d380acaec 3d3641152 Author: Nick Mathewson <nickm@torproject.org> Date: Wed May 6 16:46:31 2020 -0400 Merge branch 'bug34078_prelim_035' into maint-0.3.5 configure.ac | 16 ++++++++++++++++ src/core/proto/proto_socks.c | 5 ++++- src/ext/ed25519/donna/ed25519_tor.c | 4 +++- src/feature/dirauth/keypin.c | 2 +- src/feature/relay/dns.c | 2 +- src/lib/cc/compat_compiler.h | 6 ++++++ src/lib/crypt_ops/crypto_digest.c | 2 +- src/lib/net/address.c | 1 + 8 files changed, 33 insertions(+), 5 deletions(-)