Merge branch 'ticket25268_034_01'

1 files changed, 0 insertions, 15 deletions

diff --git a/src/or/channel.c b/src/or/channel.c
index ff1cfde2ad..a9483ee021 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -2109,21 +2109,6 @@ channel_listener_dumpstats(int severity)
 }
 
 /**
- * Set the cmux policy on all active channels.
- */
-void
-channel_set_cmux_policy_everywhere(circuitmux_policy_t *pol)
-{
-  if (!active_channels) return;
-
-  SMARTLIST_FOREACH_BEGIN(active_channels, channel_t *, curr) {
-    if (curr->cmux) {
-      circuitmux_set_policy(curr->cmux, pol);
-    }
-  } SMARTLIST_FOREACH_END(curr);
-}
-
-/**
  * Clean up channels.
  *
  * This gets called periodically from run_scheduled_events() in main.c;