Merge remote-tracking branch 'dgoulet/bug24700_032_01' into maint-0.3.2
commit77634795b0258f04a31a51d827d45eab40557f65
authorNick Mathewson <nickm@torproject.org>
Thu, 1 Feb 2018 21:57:57 +0000 (1 16:57 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 1 Feb 2018 21:57:57 +0000 (1 16:57 -0500)
tree09a57f4250433ed1461ecf61bb30c541d355cc94
parent31542cc306ea6d7f4ca629fccd9bcd536573f6d8
parentcb5654f300312a8f4c777378d68696667eff427b
Merge remote-tracking branch 'dgoulet/bug24700_032_01' into maint-0.3.2
src/or/scheduler.c
src/or/scheduler_kist.c