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

[nickm at torproject.org]

commit d1a9f6de9d224249e34b1d18c5e8ec0fcec81ec0
Merge: 1962a4ea9 ced350882
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 23 14:24:41 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

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