[tor-commits] [tor/master] Fix ewma_cmp_cmux never considering policies different

[nickm at torproject.org]

commit c09993fdf6beb80d8c5f34250092c931333f7ac0
Author: Matt Traudt <sirmatt at ksu.edu>
Date:   Tue Oct 25 10:07:05 2016 -0400

    Fix ewma_cmp_cmux never considering policies different
---
 changes/bug20459         | 3 +++
 src/or/circuitmux_ewma.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/bug20459 b/changes/bug20459
new file mode 100644
index 0000000..6878188
--- /dev/null
+++ b/changes/bug20459
@@ -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.
diff --git a/src/or/circuitmux_ewma.c b/src/or/circuitmux_ewma.c
index 5c2ebde..0219459 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 */