commit 046acf208bc53a3fa7ea9967707835188eb6651c Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 6 15:46:54 2017 -0500

Fix a compiler warning --- src/common/compat_time.c | 6 +++--- src/or/circuituse.c | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/common/compat_time.c b/src/common/compat_time.c index 7c8988166..84033d5d2 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 aa0df9565..497d93923 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)) {