commit ed45a95349e865023e2b2a1d6d2160d4500cfb33 Merge: 17d7095e1 0878bb961 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 29 15:57:30 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug28202 | 4 ++++ src/or/routerparse.c | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-)