]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'dgoulet/ticket23696_032_01'
authorNick Mathewson <nickm@torproject.org>
Fri, 29 Sep 2017 21:46:50 +0000 (17:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 29 Sep 2017 21:46:50 +0000 (17:46 -0400)
1  2 
src/or/scheduler_kist.c

Simple merge