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

[nickm at torproject.org]

commit 7d66ec0feba7aa7cfbaeb8c3af2df35cdcd536f1
Merge: d102e9c2e a159eaf45
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 30 08:45:01 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

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