commit 6170f87e01cc0d5f341c6a74ecb07f7f8838e6a5 Merge: 7dbaaba3d 0b795ce6d Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 27 18:25:21 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

changes/bug25629 | 3 +++ src/or/nodelist.c | 28 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 14 deletions(-)