commit d05780c1bb5bc171d14102cdbe7b630c65ff45e5 Merge: 8c9b5bfb8 bebdd9105 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 6 10:16:18 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/or/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)