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

[nickm at torproject.org]

commit d04b708b4bd47ee8df6796f19b25f558b2b18e91
Merge: bbfc498e2 28f453c47
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 6 16:47:03 2020 -0400

    Merge branch 'maint-0.4.1' into maint-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(-)