[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug27236-034' into maint-0.3.4

[nickm at torproject.org]

commit ced350882dc7fc7e66adce91f9514a7244f26c76
Merge: 573b6e4f2 fadcab920
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 23 14:22:30 2018 -0400

    Merge remote-tracking branch 'teor/bug27236-034' into maint-0.3.4

 changes/bug27236  |  5 ++++
 src/or/nodelist.c | 80 ++++++++++++++++++++++++++++---------------------------
 2 files changed, 46 insertions(+), 39 deletions(-)