diff --git a/src/common/compat_time.c b/src/common/compat_time.c
index 7c89881667..84033d5d22 100644
--- a/src/common/compat_time.c
+++ b/src/common/compat_time.c
@@ -415,7 +415,7 @@ monotime_diff_nsec(const monotime_t *start,
 }
 
 /* This value is ONE_BILLION >> 20. */
-const uint32_t STAMP_TICKS_PER_SECOND = 953;
+static const uint32_t STAMP_TICKS_PER_SECOND = 953;
 
 uint32_t
 monotime_coarse_to_stamp(const monotime_coarse_t *t)
@@ -558,7 +558,7 @@ monotime_coarse_diff_nsec(const monotime_coarse_t *start,
   return monotime_coarse_diff_msec(start, end) * ONE_MILLION;
 }
 
-const uint32_t STAMP_TICKS_PER_SECOND = 1000;
+static const uint32_t STAMP_TICKS_PER_SECOND = 1000;
 
 uint32_t
 monotime_coarse_to_stamp(const monotime_coarse_t *t)
@@ -603,7 +603,7 @@ monotime_diff_nsec(const monotime_t *start,
 }
 
 /* This value is ONE_MILLION >> 10. */
-const uint32_t STAMP_TICKS_PER_SECOND = 976;
+static const uint32_t STAMP_TICKS_PER_SECOND = 976;
 
 uint32_t
 monotime_coarse_to_stamp(const monotime_coarse_t *t)
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index aa0df95652..497d93923e 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1038,6 +1038,9 @@ circuit_stream_is_being_handled(entry_connection_t *conn,
         continue;
       if (origin_circ->unusable_for_new_conns)
         continue;
+      if (origin_circ->isolation_values_set &&
+          !connection_edge_compatible_with_circuit(conn, origin_circ))
+        continue;
 
       exitnode = build_state_get_exit_node(build_state);
       if (exitnode && (!need_uptime || build_state->need_uptime)) {