[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0

[nickm at torproject.org]

commit 5dbbd6bc392892df63a02cf601f94fa1fae6ebfc
Merge: 3336f26 67cec75
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 17 11:32:45 2017 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0

 src/or/routerparse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)