commit 85eadb733f7a58107e9f3b6fd81094cab4c29b6c Merge: c366e1f 9a34caa Author: Nick Mathewson <nickm@torproject.org> Date: Thu Apr 23 11:05:24 2015 -0400 Merge remote-tracking branch 'teor/longest-policy-comment' src/or/routerparse.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)