commit 6cd567d7974e6bf55874f3a6d907feb050144095
Merge: 84adb9fcc fdfa4a5a1
Author: Nick Mathewson <ni...@torproject.org>
Date: Thu Dec 21 11:13:33 2017 -0500
Merge remote-tracking branch 'dgoulet/bug24671_032_01' into maint-0.3.2
changes/bug24671 | 6 ++++++
src/or/scheduler_kist.c | 22 ++++++++++++++++------
2 files changed, 22 insertions(+), 6 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
