February 2019 - tor-commits - lists.torproject.org

[tor/release-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4
by teor＠torproject.org 28 Feb '19

28 Feb '19

commit 6a61a020eefa74b8466fa043f95391d37c06fcf6 Merge: 524731503 be71cce9f Author: teor <teor(a)torproject.org> Date: Thu Feb 28 10:49:19 2019 +1000 Merge branch 'maint-0.3.3' into maint-0.3.4 src/test/test_shared_random.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'bug29599_029' into bug29599_033
by teor＠torproject.org 28 Feb '19

28 Feb '19

commit 64e082e892a87b0565677272c412c23903f51f5c Merge: 6c966b894 4d9eb4dd0 Author: teor <teor(a)torproject.org> Date: Wed Feb 27 15:06:39 2019 +1000 Merge branch 'bug29599_029' into bug29599_033 changes/bug29599 | 3 +++ src/test/test_shared_random.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 28 Feb '19

28 Feb '19

commit aef6e61347f45087305871f356891ddd959d7081 Merge: 90c8956e2 de0969ef7 Author: teor <teor(a)torproject.org> Date: Thu Feb 28 10:49:47 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'tor-github/pr/731' into maint-0.3.3
by teor＠torproject.org 28 Feb '19

28 Feb '19

commit be71cce9f851ef7ba3276fcd7f8e5bb7cc2968df Merge: 3313444ef d4b7975ce Author: teor <teor(a)torproject.org> Date: Thu Feb 28 10:48:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/731' into maint-0.3.3 src/test/test_shared_random.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 28 Feb '19

28 Feb '19

commit aef6e61347f45087305871f356891ddd959d7081 Merge: 90c8956e2 de0969ef7 Author: teor <teor(a)torproject.org> Date: Thu Feb 28 10:49:47 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0

1 0

[tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
by teor＠torproject.org 28 Feb '19

28 Feb '19

commit de0969ef7816d54acdcc9f1e2960d8bbc4400ecf Merge: be29dfedd 6a61a020e Author: teor <teor(a)torproject.org> Date: Thu Feb 28 10:49:33 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5 src/test/test_shared_random.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.3.3] test/shared-random: use sr_state_free_all() rather than sr_state_free()
by teor＠torproject.org 28 Feb '19

28 Feb '19

commit d4b7975ce70fc93671136445c95c2009408cfe70 Author: teor <teor(a)torproject.org> Date: Wed Feb 27 14:57:35 2019 +1000 test/shared-random: use sr_state_free_all() rather than sr_state_free() sr_state_free() was renamed to sr_state_free_all() between 0.2.9 and 0.3.3. Part of 29599. --- src/test/test_shared_random.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 228397641..2f762dc90 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -687,7 +687,7 @@ test_vote(void *arg) done: UNMOCK(trusteddirserver_get_by_v3_auth_digest); - sr_state_free(); + sr_state_free_all(); } static const char *sr_state_str = "Version 1\n" @@ -921,7 +921,7 @@ test_sr_compute_srv(void *arg) done: UNMOCK(trusteddirserver_get_by_v3_auth_digest); - sr_state_free(); + sr_state_free_all(); } /** Return a minimal vote document with a current SRV value set to @@ -1187,7 +1187,7 @@ test_state_transition(void *arg) } done: - sr_state_free(); + sr_state_free_all(); } static void

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'tor-github/pr/731' into maint-0.3.3
by teor＠torproject.org 28 Feb '19

28 Feb '19

commit be71cce9f851ef7ba3276fcd7f8e5bb7cc2968df Merge: 3313444ef d4b7975ce Author: teor <teor(a)torproject.org> Date: Thu Feb 28 10:48:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/731' into maint-0.3.3 src/test/test_shared_random.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by teor＠torproject.org 28 Feb '19

28 Feb '19

commit 6a61a020eefa74b8466fa043f95391d37c06fcf6 Merge: 524731503 be71cce9f Author: teor <teor(a)torproject.org> Date: Thu Feb 28 10:49:19 2019 +1000 Merge branch 'maint-0.3.3' into maint-0.3.4 src/test/test_shared_random.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by teor＠torproject.org 28 Feb '19

28 Feb '19

commit 4c43f39c562a4286587e8536e2e32d1ff421a217 Merge: 6f3f8bb1e be71cce9f Author: teor <teor(a)torproject.org> Date: Thu Feb 28 10:49:11 2019 +1000 Merge branch 'maint-0.3.3' into release-0.3.3 src/test/test_shared_random.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0