commit ef610467fa5122740cb7a964376a440f31c41696 Merge: 242f9b3 57154e7 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 28 11:19:24 2017 -0500 Merge remote-tracking branch 'teor/bug21507-029' changes/bug21507 | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+)