diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-10-26 16:22:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-10-26 16:22:06 -0400 |
| commit | 39375db3dc668f11925a82e6d4cef2beed91d47b (patch) | |
| tree | 4e0a73663f3c8d72ed90d51038c09e181b4cfbf4 /src | |
| parent | 5a1779b7ffa7445005dc271985bae43c6c761dc0 (diff) | |
| parent | c09993fdf6beb80d8c5f34250092c931333f7ac0 (diff) | |
| download | tor-39375db3dc668f11925a82e6d4cef2beed91d47b.tar.gz tor-39375db3dc668f11925a82e6d4cef2beed91d47b.zip | |
Merge remote-tracking branch 'pastly/ticket20459'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/circuitmux_ewma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitmux_ewma.c b/src/or/circuitmux_ewma.c index 5c2ebde73b..0219459cdb 100644 --- a/src/or/circuitmux_ewma.c +++ b/src/or/circuitmux_ewma.c @@ -500,7 +500,7 @@ ewma_cmp_cmux(circuitmux_t *cmux_1, circuitmux_policy_data_t *pol_data_1, tor_assert(pol_data_2); p1 = TO_EWMA_POL_DATA(pol_data_1); - p2 = TO_EWMA_POL_DATA(pol_data_1); + p2 = TO_EWMA_POL_DATA(pol_data_2); if (p1 != p2) { /* Get the head cell_ewma_t from each queue */ |