[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

[nickm at torproject.org]

commit d633c4757c1392fbbdeb3bdcc39e9b8e834f8fc9
Merge: 39af9fc fea93ab
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 15 08:19:51 2017 -0500

    Merge branch 'maint-0.2.9'

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