commit e979a56bb6d9c571ad6c033b739f9f7edc8b0000 Merge: fd2e0ac1c a5599fb71 Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 18 09:12:58 2018 -0400
Merge branch 'maint-0.3.5'
changes/bug27800 | 4 ++++ src/feature/nodelist/nodelist.c | 37 +++++++++++++++++++++++++++++++++---- src/test/test_nodelist.c | 36 ++++++++++++++++++++++++++++-------- 3 files changed, 65 insertions(+), 12 deletions(-)