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

[nickm at torproject.org]

commit 19bed6f936350dc024c82bd11d624c34063d9172
Merge: 148540c50 58f54a358
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 25 08:01:54 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

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