diff options
| author | Mike Perry <mikeperry-git@torproject.org> | 2017-02-21 21:28:00 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-08 13:49:22 -0400 |
| commit | d5a151a06788c28ac1c50398c6e571d484774f47 (patch) | |
| tree | d2e4f2719130250e428f1991a01511c89e589a29 /src/test/testing_common.c | |
| parent | b0e92634d85a3bf7612a6ce0339b96e4aad1e0bb (diff) | |
| download | tor-d5a151a06788c28ac1c50398c6e571d484774f47.tar.gz tor-d5a151a06788c28ac1c50398c6e571d484774f47.zip | |
Bug 17592: Clean up connection timeout logic.
This unifies CircuitIdleTimeout and PredictedCircsRelevanceTime into a single
option, and randomizes it.
It also gives us control over the default value as well as relay-to-relay
connection lifespan through the consensus.
Conflicts:
src/or/circuituse.c
src/or/config.c
src/or/main.c
src/test/testing_common.c
Diffstat (limited to 'src/test/testing_common.c')
| -rw-r--r-- | src/test/testing_common.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/test/testing_common.c b/src/test/testing_common.c index caeae13a38..43cf0aa508 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -304,10 +304,13 @@ main(int c, const char **v) tor_free(errmsg); return 1; } + tor_set_failed_assertion_callback(an_assertion_failed); init_pregenerated_keys(); + predicted_ports_init(); + atexit(remove_directory); int have_failed = (tinytest_main(c, v, testgroups) != 0); |