commit fb4307bf22067409ea7afd10178a4695490dc185 Merge: 7a55efbd5 7c3f87eb4 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 25 08:01:54 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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