[tor-commits] [tor/master] Merge branch 'ahf_bug22497_redux'

[nickm at torproject.org]

commit da75dfc0e52ea1dee89396a2d7bfb0a0339358db
Merge: 91c6bc160 e7c1a6f4f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 24 16:11:43 2017 -0400

    Merge branch 'ahf_bug22497_redux'

 changes/bug22497                          |   4 +
 scripts/coccinelle/ceil_div.cocci         |   6 +
 scripts/coccinelle/test-operator-cleanup  |  11 +
 scripts/coccinelle/test_assert_int.cocci  |  49 ++
 scripts/coccinelle/test_assert_null.cocci |  11 +
 scripts/coccinelle/test_assert_zero.cocci |   5 +
 src/common/aes.c                          |   2 +-
 src/common/compat_time.c                  |   2 +-
 src/or/rephist.c                          |   2 +-
 src/test/test.c                           |  53 +--
 src/test/test.h                           |   4 +-
 src/test/test_addr.c                      |  36 +-
 src/test/test_address.c                   |  68 +--
 src/test/test_buffers.c                   |   8 +-
 src/test/test_channel.c                   | 287 ++++++------
 src/test/test_channeltls.c                |  30 +-
 src/test/test_circuitmux.c                |   6 +-
 src/test/test_circuituse.c                |  31 +-
 src/test/test_config.c                    | 428 +++++++++---------
 src/test/test_connection.c                | 316 ++++++-------
 src/test/test_conscache.c                 |   6 +-
 src/test/test_consdiffmgr.c               |   4 +-
 src/test/test_containers.c                |  66 +--
 src/test/test_controller.c                | 278 ++++++------
 src/test/test_crypto.c                    |  36 +-
 src/test/test_crypto_openssl.c            |   6 +-
 src/test/test_crypto_slow.c               |  26 +-
 src/test/test_dir.c                       | 718 +++++++++++++++---------------
 src/test/test_dir_common.c                |   2 +-
 src/test/test_dns.c                       |  64 +--
 src/test/test_entrynodes.c                |  92 ++--
 src/test/test_guardfraction.c             |  48 +-
 src/test/test_helpers.c                   |  10 +-
 src/test/test_hs.c                        | 160 +++----
 src/test/test_hs_cache.c                  |  40 +-
 src/test/test_hs_client.c                 |  12 +-
 src/test/test_hs_common.c                 |  60 +--
 src/test/test_hs_descriptor.c             | 107 ++---
 src/test/test_hs_intropoint.c             |  34 +-
 src/test/test_hs_ntor.c                   |   8 +-
 src/test/test_hs_service.c                |  16 +-
 src/test/test_introduce.c                 |   6 +-
 src/test/test_keypin.c                    | 103 ++---
 src/test/test_link_handshake.c            | 286 ++++++------
 src/test/test_logging.c                   |   8 +-
 src/test/test_microdesc.c                 |  12 +-
 src/test/test_oos.c                       |  18 +-
 src/test/test_options.c                   |  14 +-
 src/test/test_policy.c                    | 365 +++++++--------
 src/test/test_protover.c                  |  22 +-
 src/test/test_pt.c                        |  34 +-
 src/test/test_relay.c                     |   4 +-
 src/test/test_rendcache.c                 |   6 +-
 src/test/test_replay.c                    |  24 +-
 src/test/test_routerkeys.c                | 199 +++++----
 src/test/test_routerlist.c                |  66 +--
 src/test/test_scheduler.c                 | 140 +++---
 src/test/test_shared_random.c             | 242 +++++-----
 src/test/test_socks.c                     |  50 ++-
 src/test/test_status.c                    |   6 +-
 src/test/test_storagedir.c                |   2 +-
 src/test/test_threads.c                   |  12 +-
 src/test/test_tortls.c                    |   4 +-
 src/test/test_util.c                      | 212 ++++-----
 src/test/test_util_format.c               |   8 +-
 src/test/test_util_slow.c                 |   2 +-
 66 files changed, 2562 insertions(+), 2435 deletions(-)