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

[nickm at torproject.org]

commit 49542ff72432b408aa1291d045b1deb5f6af139f
Merge: 5c3998a02 588c77677
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 24 08:32:33 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

 src/or/nodelist.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)