[tor-commits] [tor/maint-0.3.3] Merge remote-tracking branch 'teor/bug26924_032' into maint-0.3.2

[nickm at torproject.org]

commit fea35ddf0017827cb5e26bb725574108ad97c261
Merge: a8bdb851e 859d5a737
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 30 08:44:40 2018 -0400

    Merge remote-tracking branch 'teor/bug26924_032' into maint-0.3.2

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