[tor-commits] [tor/master] Merge remote-tracking branch 'github/ticket26626'

[nickm at torproject.org]

commit df98582851a92d514c04061a5e0ec762c17a0cfb
Merge: fe8f77482 02a444252
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 3 12:52:43 2018 -0400

    Merge remote-tracking branch 'github/ticket26626'

 changes/ticket26626                  |   3 +
 configure.ac                         |  17 --
 src/common/procmon.c                 |   4 +-
 src/lib/cc/compat_compiler.h         |  48 +-----
 src/lib/cc/torint.h                  | 267 +-------------------------------
 src/lib/intmath/bits.c               |  16 +-
 src/lib/net/nettypes.h               |   2 +-
 src/lib/time/tvdiff.c                |  20 +--
 src/lib/tls/tortls.c                 |   4 +-
 src/lib/wallclock/tm_cvt.c           |   4 +-
 src/lib/wallclock/tor_gettimeofday.c |   8 +-
 src/or/addressmap.c                  |   2 +-
 src/or/channel.c                     | 290 +++++++++++++++++------------------
 src/or/channelpadding.c              |  26 ++--
 src/or/channeltls.c                  |  72 ++++-----
 src/or/circuitbuild.c                |  16 +-
 src/or/circuitlist.c                 |  16 +-
 src/or/circuitmux.c                  |  58 +++----
 src/or/circuitstats.c                |   4 +-
 src/or/circuituse.c                  |  11 +-
 src/or/command.c                     |   4 +-
 src/or/config.c                      |  12 +-
 src/or/config.h                      |   4 +-
 src/or/confparse.c                   |  24 +--
 src/or/connection.c                  |  12 +-
 src/or/connection_edge.c             |   4 +-
 src/or/connection_or.c               |   4 +-
 src/or/control.c                     |  40 ++---
 src/or/cpuworker.c                   |   2 +-
 src/or/dirauth/dirvote.c             |  68 ++++----
 src/or/directory.c                   |  12 +-
 src/or/geoip.c                       |   8 +-
 src/or/hibernate.c                   |  32 ++--
 src/or/main.c                        |  52 +++----
 src/or/microdesc.c                   |   6 +-
 src/or/policies.c                    |   6 +-
 src/or/rephist.c                     | 132 ++++++++--------
 src/or/router.c                      |   4 +-
 src/or/routerlist.c                  |   8 +-
 src/or/routerparse.c                 | 170 ++++++++++----------
 src/or/scheduler_vanilla.c           |  16 +-
 src/or/status.c                      |  22 +--
 src/or/torcert.c                     |   2 +-
 src/test/test-timers.c               |   4 +-
 src/test/test.h                      |  22 +--
 src/test/test_bwmgt.c                |   2 +-
 src/test/test_channel.c              |   2 +-
 src/test/test_circuitmux.c           |   2 +-
 src/test/test_config.c               |   4 +-
 src/test/test_crypto.c               |  16 +-
 src/test/test_dir.c                  |  10 +-
 src/test/test_geoip.c                |   1 -
 src/test/test_mainloop.c             |   4 +-
 src/test/test_options.c              |   2 +-
 src/test/test_status.c               |   2 +-
 src/test/test_util.c                 |  36 ++---
 src/test/test_util_format.c          |   4 +-
 57 files changed, 656 insertions(+), 987 deletions(-)