diff options
author | teor <teor@torproject.org> | 2019-03-18 11:30:37 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2019-03-18 11:30:37 +1000 |
commit | af21d126e6b138c6f986f02c33c8c38d9bcd537f (patch) | |
tree | bb9000611833a573251fefe3d9f95034a18930be /src | |
parent | 1547fd99a68cb22410ed0842267fb0a1f1de925f (diff) | |
parent | 55865a2c9c9929b690a4f5a969afd5d4415c40bd (diff) | |
download | tor-af21d126e6b138c6f986f02c33c8c38d9bcd537f.tar.gz tor-af21d126e6b138c6f986f02c33c8c38d9bcd537f.zip |
Merge branch 'bug29706_035_minimal_merge' into bug29706_040_minimal_merge
Comment merge.
Diffstat (limited to 'src')
-rw-r--r-- | src/test/test_shared_random.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 2316d26b7e..5fa7e80d07 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -606,7 +606,9 @@ test_encoding(void *arg) static void test_sr_setup_srv(int also_current) { - /* Clear both SRVs before starting. */ + /* Clear both SRVs before starting. + * In 0.3.5 and earlier, sr_state_set_previous_srv() and + * sr_state_set_current_srv() do not free() the old srvs. */ sr_state_clean_srvs(); sr_srv_t *srv = tor_malloc_zero(sizeof(sr_srv_t)); |