Merge remote-tracking branch 'dgoulet/bug24700_032_01' into maint-0.3.2

author Nick Mathewson <nickm@torproject.org>

Thu, 1 Feb 2018 21:57:57 +0000 (16:57 -0500)

committer Nick Mathewson <nickm@torproject.org>

Thu, 1 Feb 2018 21:57:57 +0000 (16:57 -0500)
author Nick Mathewson <nickm@torproject.org>
Thu, 1 Feb 2018 21:57:57 +0000 (16:57 -0500)
committer Nick Mathewson <nickm@torproject.org>
Thu, 1 Feb 2018 21:57:57 +0000 (16:57 -0500)
diff --cc src/or/scheduler.c
Simple merge
diff --cc src/or/scheduler_kist.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Thu, 1 Feb 2018 21:57:57 +0000 (16:57 -0500)
committer	Nick Mathewson <nickm@torproject.org>
	Thu, 1 Feb 2018 21:57:57 +0000 (16:57 -0500)
		1	2
src/or/scheduler.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/scheduler_kist.c	patch \|	diff1 \|	diff2 \|	blob \| history