commit a23a168f24b490958e999603a719d15ae42755a9
Merge: aaf0fa6d1 c7af92356
Author: Nick Mathewson <ni...@torproject.org>
Date: Mon Sep 18 11:02:37 2017 -0400
Merge remote-tracking branch 'dgoulet/bug23558_032_01'
src/or/scheduler.c | 6 +++++-
src/or/scheduler_kist.c | 15 ++++++++++++---
2 files changed, 17 insertions(+), 4 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
