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

[nickm@xxxxxxxxxxxxxx]

commit fecc5fd38d80093a9c189eece4acd41c35cd36c6
Merge: e61867416 d04b708b4
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed May 6 16:47:03 2020 -0400

    Merge branch 'maint-0.4.2' into maint-0.4.3

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




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits