commit c2d002c63337fa774e3ed19e9585a9f699f47850 Merge: 21180862e d04b708b4 Author: Nick Mathewson nickm@torproject.org Date: Wed May 6 16:47:03 2020 -0400

Merge branch 'maint-0.4.2' into release-0.4.2

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_nss.c | 3 +-- src/lib/net/address.c | 1 + 8 files changed, 33 insertions(+), 6 deletions(-)