mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 14:51:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'pastly/ticket20459'

Browse source
This commit is contained in:
Nick Mathewson 2016-10-26 16:22:06 -04:00
commit 39375db3dc
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changes/bug20459 Normal file
View file

@ -0,0 +1,3 @@
o Minor bugfixes:
- Fix ewma_cmp_cmux never considering circuit policies to be different.
Introduced in 0.2.6. Fixes bug 20459.

2
src/or/circuitmux_ewma.c
View file

@ -500,7 +500,7 @@ ewma_cmp_cmux(circuitmux_t *cmux_1, circuitmux_policy_data_t *pol_data_1,
tor_assert(pol_data_2); tor_assert(pol_data_2);
p1 = TO_EWMA_POL_DATA(pol_data_1); 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) { if (p1 != p2) {
/* Get the head cell_ewma_t from each queue */ /* Get the head cell_ewma_t from each queue */