[tor-commits] [tor/release-0.4.2] Merge branch 'bug34078_prelim_041' into maint-0.4.1

[nickm at torproject.org]

commit 1041306092e978f6b028693e7893470bff1c61f9
Merge: a02e86664 3e42464f5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 6 16:46:52 2020 -0400

    Merge branch 'bug34078_prelim_041' into maint-0.4.1

 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(-)