commit ec9c6d77234809d5bdc06357100ca4bffbbec18c Merge: 4060253 57154e7 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 28 14:03:20 2017 -0400

Merge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9

changes/bug21507 | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+)