diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-04 12:05:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-04 12:05:51 -0400 |
| commit | 1bb6e3b503bfe4f7f5a8ee707433b6f9973e4dea (patch) | |
| tree | 69cae755f5ceceb70e1bb134a100f29857469b9a /src | |
| parent | fb595922b12c9ab89f51527def68e9b71386caf7 (diff) | |
| parent | 09dbcf3b82c6db76024a5345b98f34028b40c30c (diff) | |
| download | tor-1bb6e3b503bfe4f7f5a8ee707433b6f9973e4dea.tar tor-1bb6e3b503bfe4f7f5a8ee707433b6f9973e4dea.tar.gz | |
Merge remote-tracking branch 'public/bug9841_024_v2' into bug9841_025
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/circuitlist.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 0d41b51c7..a5b43f737 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1334,6 +1334,11 @@ circuit_set_rend_token(or_circuit_t *circ, int is_rend_circ, if (circ->rendinfo) circuit_clear_rend_token(circ); + if (token == NULL) { + /* We were only trying to remove this token, not set a new one. */ + return; + } + found_circ = digestmap_get(map, (const char *)token); if (found_circ) { tor_assert(found_circ != circ); |