commit 90716e3f9ce3d5316d6d38323e2cc7c3125b576f
Merge: 1a4876587 77634795b
Author: Nick Mathewson <ni...@torproject.org>
Date: Thu Feb 1 16:58:03 2018 -0500
Merge branch 'maint-0.3.2' into release-0.3.2
changes/bug24700 | 4 ++++
src/or/channel.c | 3 +++
src/or/scheduler.c | 20 ++++++++++++--------
src/or/scheduler_kist.c | 14 ++++++++++----
4 files changed, 29 insertions(+), 12 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
