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

[nickm at torproject.org]

commit eb75966720a15b89b0f6a814c4e1d8446479db08
Merge: 8a4b41f24 dd27e17cc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 24 12:05:39 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

 src/or/nodelist.c | 52 ++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 16 deletions(-)