Merge remote-tracking branch 'pastly/ticket20459'

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.

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 */