commit c06b5eb0e3dfa7834c3c6996fd46f1ae4768240f Merge: 0d67e8d ec9c6d7 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jun 28 14:03:23 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug21507 | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+)