[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

[nickm at torproject.org]

commit 1a646880d1115c352ae12ce4cfae41690f7e834f
Merge: 6716cd090 a159eaf45
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 30 08:45:01 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug26924       |  4 ++++
 changes/bug26927       |  4 ++++
 src/or/connection_or.c | 14 +++++++++-----
 3 files changed, 17 insertions(+), 5 deletions(-)