commit cf19065425344411ef18dee2d95caa12dcdb9687 Merge: ec638e236 93fd924bd Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 18 09:12:57 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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