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

[nickm at torproject.org]

commit d1eac7830fbd86d145c1892b8a7123615cc34658
Merge: 2000d04cb 93fd924bd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 18 09:12:58 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug27800         |  4 ++++
 src/or/nodelist.c        | 37 +++++++++++++++++++++++++++++++++----
 src/test/test_nodelist.c | 36 ++++++++++++++++++++++++++++--------
 3 files changed, 65 insertions(+), 12 deletions(-)