commit 0f1b510b60dcc5edb7332615c10097fce0d216a3 Merge: fe022f3ab 9ae4ffc07 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 23 15:55:48 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

changes/bug23874 | 3 +++ src/or/nodelist.c | 5 +++++ 2 files changed, 8 insertions(+)