commit 39375db3dc668f11925a82e6d4cef2beed91d47b Merge: 5a1779b c09993f Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 26 16:22:06 2016 -0400

Merge remote-tracking branch 'pastly/ticket20459'

changes/bug20459 | 3 +++ src/or/circuitmux_ewma.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)