diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-14 10:15:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-14 10:15:38 -0400 |
| commit | 471e0096ad832ac8d6840254892bde96ea38df45 (patch) | |
| tree | 8597369d82aa86b3eee94057d2ff0582c6ea74df | |
| parent | 6fc47062affef5653eae59dbe220f86da81f57ff (diff) | |
| parent | a971018f6d0a457fddfaa1397ae823623257c2f6 (diff) | |
| download | tor-471e0096ad832ac8d6840254892bde96ea38df45.tar.gz tor-471e0096ad832ac8d6840254892bde96ea38df45.zip | |
Merge branch 'maint-0.3.0' into maint-0.3.1
| -rw-r--r-- | src/or/entrynodes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index fa768fc4a6..26f53cbfe9 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -2385,7 +2385,7 @@ entry_guards_upgrade_waiting_circuits(guard_selection_t *gs, SMARTLIST_FOREACH_BEGIN(all_circuits, origin_circuit_t *, circ) { circuit_guard_state_t *state = origin_circuit_get_guard_state(circ); - if BUG((state == NULL)) + if (BUG(state == NULL)) continue; if (state->state == GUARD_CIRC_STATE_WAITING_FOR_BETTER_GUARD) { |