commit c26fa05370b858035e5a8b92c21deb78dbc1f8ea Merge: 2a0865898 4bb7d9fd1 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 27 18:23:53 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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