commit 5acfc3087663340f55de6081cdd13b484525f43a Merge: 068d09274 4bb7d9fd1 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 27 18:23:53 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

changes/bug25629 | 3 +++ src/or/nodelist.c | 13 ++++++------- 2 files changed, 9 insertions(+), 7 deletions(-)