[tor-commits] [tor/master] Merge branch 'remove-padding-fix-7869-v2'

[nickm at torproject.org]

commit b3112a6d26d4f142e3007994ce8da6d7517287bb
Merge: 9cd20e8276 8763d96d20
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 23 08:26:44 2020 -0400

    Merge branch 'remove-padding-fix-7869-v2'

 changes/ticket7869                    |  3 +++
 src/feature/dirauth/dirvote.c         | 11 ++++++-----
 src/feature/dirauth/dirvote.h         |  6 +++++-
 src/feature/hs/hs_descriptor.c        |  7 ++++---
 src/feature/relay/router.c            |  8 +++-----
 src/lib/crypt_ops/crypto_curve25519.h |  4 +++-
 src/lib/crypt_ops/crypto_format.c     | 35 ++++++++++++++++++++++-------------
 src/lib/defs/x25519_sizes.h           |  3 +++
 src/test/test_crypto.c                | 10 +++++-----
 src/test/test_dir.c                   |  8 ++------
 10 files changed, 56 insertions(+), 39 deletions(-)