commit edf721f8f018b6a53a148c480f94a2bd4d795cc8 Merge: beaaeecd2 bb35405d2 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 25 08:01:53 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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