commit 3c74bc73fc9d801c590b1f8565d12a08e7ba4f2c Merge: 2e334d9 67cec75 Author: Nick Mathewson <nickm at torproject.org> Date: Fri Feb 17 11:32:38 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 src/or/routerparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)