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

[nickm at torproject.org]

commit 34f92a6e733440c2c41006533e37ac96a35fad3c
Merge: da1f76f12 8c23ac4ae
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 20 07:18:38 2019 -0500

    Merge remote-tracking branch 'tor-github/pr/1623'

 src/core/mainloop/connection.c      | 2 +-
 src/core/or/channel.c               | 4 ++--
 src/core/or/channel.h               | 8 ++++----
 src/core/or/channelpadding.c        | 4 ++--
 src/core/or/channeltls.c            | 2 +-
 src/core/or/channeltls.h            | 4 ++--
 src/core/or/connection_or.c         | 2 +-
 src/core/or/scheduler.c             | 4 ++--
 src/core/or/scheduler.h             | 4 ++--
 src/core/or/scheduler_kist.c        | 4 ++--
 src/core/or/scheduler_vanilla.c     | 4 ++--
 src/feature/dirparse/policy_parse.c | 2 +-
 src/feature/dirparse/routerparse.c  | 2 +-
 src/feature/dirparse/routerparse.h  | 2 +-
 src/lib/err/backtrace.c             | 2 +-
 src/lib/err/backtrace.h             | 4 ++--
 src/lib/sandbox/sandbox.c           | 2 +-
 src/test/test_channel.c             | 4 ++--
 src/test/test_channelpadding.c      | 2 +-
 src/test/test_channeltls.c          | 2 +-
 src/test/test_circuitlist.c         | 2 +-
 src/test/test_circuitmux.c          | 2 +-
 src/test/test_circuitpadding.c      | 2 +-
 src/test/test_circuitstats.c        | 2 +-
 src/test/test_controller_events.c   | 2 +-
 src/test/test_dos.c                 | 2 +-
 src/test/test_hs_cache.c            | 2 +-
 src/test/test_hs_client.c           | 2 +-
 src/test/test_hs_service.c          | 2 +-
 src/test/test_link_handshake.c      | 2 +-
 src/test/test_scheduler.c           | 6 +++---
 31 files changed, 45 insertions(+), 45 deletions(-)