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

[nickm at torproject.org]

commit a7599c5be2cd9b02a2b0e9760a6762a623fd0d7b
Merge: 4b8c77a59 f12b990bb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 23 12:48:37 2019 -0400

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

 changes/ticket27821                      |  3 +++
 scripts/maint/practracker/exceptions.txt |  2 +-
 src/core/or/connection_edge.c            | 27 ++++++++++++++++++++++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)