commit 7b386f2356c9c706e9432b19058dee8147030056 Merge: 86aa14157 ebbc2c3d8 Author: George Kadianakis desnacked@riseup.net Date: Fri Apr 12 13:47:08 2019 +0300

Merge branch 'tor-github/pr/908'

changes/ticket29660 | 5 ++ src/feature/dirauth/dirvote.c | 3 +- src/feature/hs/hs_client.c | 16 ++----- src/feature/hs/hs_control.c | 23 ++------- src/feature/hs/hs_descriptor.c | 27 +++-------- src/feature/relay/router.c | 13 ++---- src/lib/crypt_ops/crypto_curve25519.h | 4 +- src/lib/crypt_ops/crypto_format.c | 88 ++++++++++++++++++++--------------- src/lib/crypt_ops/crypto_format.h | 12 ++--- src/lib/encoding/binascii.c | 6 ++- src/test/test_crypto.c | 6 +-- src/test/test_dir.c | 4 +- src/test/test_hs_cache.c | 4 +- src/test/test_hs_control.c | 3 +- src/test/test_hs_descriptor.c | 3 +- 15 files changed, 94 insertions(+), 123 deletions(-)