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

[nickm at torproject.org]

commit 72c9d6dbf7b6396326dcd3f7cd8a144868a64e57
Merge: 6c333e8e0 633366efc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 6 16:58:12 2020 -0400

    Merge branch 'maint-0.4.1' into release-0.4.1

 changes/bug34078                          |  5 ++++
 src/app/config/confparse.c                |  8 +++---
 src/core/or/channeltls.c                  |  2 +-
 src/core/or/circuitbuild.c                |  2 +-
 src/core/or/circuitlist.c                 |  2 +-
 src/core/or/circuituse.c                  |  2 +-
 src/core/or/connection_edge.c             |  6 ++--
 src/core/or/crypt_path.c                  |  2 +-
 src/core/or/onion.c                       |  2 +-
 src/core/or/policies.c                    |  2 +-
 src/core/or/reasons.c                     |  2 +-
 src/core/or/relay.c                       |  2 +-
 src/core/or/scheduler.c                   |  4 +--
 src/core/or/sendme.c                      |  2 +-
 src/core/proto/proto_socks.c              |  4 +--
 src/ext/csiphash.c                        | 14 ++++-----
 src/ext/ed25519/donna/modm-donna-32bit.h  | 48 +++++++++++++++----------------
 src/ext/ed25519/donna/modm-donna-64bit.h  | 24 ++++++++--------
 src/feature/client/entrynodes.c           |  2 +-
 src/feature/control/control_cmd.c         |  2 +-
 src/feature/dirclient/dirclient.c         |  2 +-
 src/feature/dirparse/parsecommon.c        |  2 +-
 src/feature/relay/dns.c                   |  2 +-
 src/feature/rend/rendclient.c             |  2 +-
 src/lib/crypt_ops/crypto_digest_nss.c     | 26 ++++++++---------
 src/lib/crypt_ops/crypto_digest_openssl.c | 10 +++----
 src/test/test_socks.c                     |  2 +-
 27 files changed, 94 insertions(+), 89 deletions(-)