commit c6523a6398efb07831ede8234486ee8f385ed558 Merge: def96ce83 e1771aeb5 Author: Nick Mathewson nickm@torproject.org Date: Mon May 13 14:25:54 2019 -0400

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

changes/bug29231 | 4 ++++ scripts/maint/practracker/exceptions.txt | 4 ++-- src/core/or/channel.c | 11 +++++++++++ src/core/or/channeltls.c | 4 ++-- src/core/or/circuitpadding.c | 2 +- src/core/or/connection_or.c | 5 ++++- src/core/or/relay.c | 2 +- src/core/or/relay.h | 1 + 8 files changed, 26 insertions(+), 7 deletions(-)