[tor-commits] [tor/master] Merge branch 'tor-github/pr/994'

[dgoulet at torproject.org]

commit b72f5da03d12e0ac2212d18e3dea309d23ded79c
Merge: c8c64caf3 295feeb09
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue May 7 08:02:39 2019 -0400

    Merge branch 'tor-github/pr/994'
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>

 changes/bug30309                          |  3 +++
 src/core/mainloop/connection.c            |  2 +-
 src/core/or/channeltls.c                  |  2 +-
 src/core/or/circuitbuild.c                |  2 +-
 src/feature/client/bridges.c              |  2 +-
 src/feature/dirauth/dirvote.c             |  4 ++--
 src/feature/dirauth/dsigs_parse.c         |  2 +-
 src/feature/dirauth/shared_random.c       |  4 ++--
 src/feature/dirauth/shared_random_state.c |  2 +-
 src/feature/dirclient/dirclient.c         |  2 +-
 src/feature/dircommon/voting_schedule.c   |  2 +-
 src/feature/dirparse/ns_parse.c           |  2 +-
 src/feature/hs/hs_common.c                | 12 ++++++------
 src/feature/hs/hs_descriptor.c            | 20 ++++++++++----------
 src/feature/hs/hs_intropoint.c            |  4 ++--
 src/feature/hs/hs_service.c               |  8 ++++----
 src/feature/nodelist/fmt_routerstatus.c   |  2 +-
 src/feature/nodelist/microdesc.c          |  2 +-
 src/feature/nodelist/nodelist.c           |  2 +-
 src/feature/nodelist/routerlist.c         |  4 ++--
 src/feature/nodelist/torcert.c            |  2 +-
 src/feature/relay/router.c                |  8 ++++----
 src/feature/relay/routerkeys.c            |  2 +-
 src/feature/rend/rendcache.c              |  6 ++++--
 src/lib/crypt_ops/crypto_ed25519.c        |  2 +-
 src/lib/crypt_ops/crypto_format.c         |  2 +-
 src/lib/crypt_ops/crypto_rand.c           |  3 ++-
 src/lib/string/util_string.c              |  9 +++------
 src/lib/string/util_string.h              |  5 ++++-
 src/test/test.c                           |  2 +-
 src/test/test_addr.c                      |  4 ++--
 src/test/test_crypto.c                    |  4 ++--
 src/test/test_crypto_slow.c               |  2 +-
 src/test/test_extorport.c                 |  4 ++--
 src/test/test_hs.c                        |  2 +-
 src/test/test_hs_cache.c                  |  2 +-
 src/test/test_hs_client.c                 |  4 ++--
 src/test/test_hs_descriptor.c             |  6 +++---
 src/test/test_hs_service.c                | 16 ++++++++--------
 src/test/test_link_handshake.c            |  4 ++--
 src/test/test_routerkeys.c                |  4 ++--
 src/test/test_shared_random.c             |  4 ++--
 src/test/test_util.c                      | 14 +++++++-------
 src/test/test_util_format.c               |  2 +-
 44 files changed, 101 insertions(+), 95 deletions(-)