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

[nickm at torproject.org]

commit 9b1d99018bdc0a52e9342afa0cf812adcfa055db
Merge: d3f0f10 5dbbd6b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 17 11:33:04 2017 -0500

    Merge branch 'maint-0.3.0'

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