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

[nickm at torproject.org]

commit 789de7c35baa23ee34c709e15e743aa54a62a479
Merge: 01f1dae8b dd795fbee
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 6 16:58:12 2020 -0400

    Merge branch 'maint-0.3.5' into release-0.3.5

 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                |  4 +--
 src/core/or/circuituse.c                 |  2 +-
 src/core/or/connection_edge.c            |  2 +-
 src/core/or/onion.c                      |  2 +-
 src/core/or/reasons.c                    |  2 +-
 src/core/or/relay.c                      |  2 +-
 src/core/or/scheduler.c                  |  4 +--
 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.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.c        | 28 +++++++++----------
 src/test/test_socks.c                    |  2 +-
 23 files changed, 86 insertions(+), 81 deletions(-)