From: Matt Traudt <sirmatt@ksu.edu>
Date: Tue, 25 Oct 2016 14:07:05 +0000 (-0400)
Subject: Fix ewma_cmp_cmux never considering policies different
X-Git-Tag: tor-0.3.0.1-alpha~211^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c09993fdf6beb80d8c5f34250092c931333f7ac0;p=thirdparty%2Ftor.git

Fix ewma_cmp_cmux never considering policies different
---

diff --git a/changes/bug20459 b/changes/bug20459
new file mode 100644
index 0000000000..68781887be
--- /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 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 */