[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm at torproject.org]

commit 7c3f87eb4b2c3c4ce3422b3561bee36f3c9956c1
Merge: 89a3fafd4 bb35405d2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 25 08:01:53 2018 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2

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