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

[nickm at torproject.org]

commit 1a57de97aecd3e6a8fdbf1d2b10d7423ea38d9ce
Merge: 33d80123c 7d66ec0fe
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 30 08:45:01 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

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