commit f2027d5bf8bc70738b14d50e7a694dfd1a47d69a Merge: d5580d9a2 ddee28a3c Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 27 18:25:52 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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