April 2018 - tor-commits - lists.torproject.org

[tor/master] Fix a copy-paste error in the fix for #23693.
by nickm＠torproject.org 25 Apr '18

25 Apr '18

commit bb35405d2ad01dbc8cf59ed275c41bd7d6098ae8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 25 08:00:55 2018 -0400 Fix a copy-paste error in the fix for #23693. Found by coverity; CID 25912; bug not in any released Tor. --- src/or/router.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/router.c b/src/or/router.c index f29ebbdf8..5405d3126 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -143,7 +143,7 @@ dup_onion_keys(crypto_pk_t **key, crypto_pk_t **last) if (onionkey) *key = crypto_pk_copy_full(onionkey); else - *last = NULL; + *key = NULL; if (lastonionkey) *last = crypto_pk_copy_full(lastonionkey); else

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 25 Apr '18

25 Apr '18

commit edf721f8f018b6a53a148c480f94a2bd4d795cc8 Merge: beaaeecd2 bb35405d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 25 08:01:53 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/or/router.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 25 Apr '18

25 Apr '18

commit a052eea4803808d4da09ef8728de22344d1241be Merge: 8664f76dd 58f54a358 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 25 08:01:54 2018 -0400 Merge branch 'maint-0.3.3' src/or/router.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Fix a copy-paste error in the fix for #23693.
by nickm＠torproject.org 25 Apr '18

25 Apr '18

commit bb35405d2ad01dbc8cf59ed275c41bd7d6098ae8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 25 08:00:55 2018 -0400 Fix a copy-paste error in the fix for #23693. Found by coverity; CID 25912; bug not in any released Tor. --- src/or/router.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/router.c b/src/or/router.c index f29ebbdf8..5405d3126 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -143,7 +143,7 @@ dup_onion_keys(crypto_pk_t **key, crypto_pk_t **last) if (onionkey) *key = crypto_pk_copy_full(onionkey); else - *last = NULL; + *key = NULL; if (lastonionkey) *last = crypto_pk_copy_full(lastonionkey); else

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 25 Apr '18

25 Apr '18

commit 7c3f87eb4b2c3c4ce3422b3561bee36f3c9956c1 Merge: 89a3fafd4 bb35405d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 25 08:01:53 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 src/or/router.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Fix a copy-paste error in the fix for #23693.
by nickm＠torproject.org 25 Apr '18

25 Apr '18

commit bb35405d2ad01dbc8cf59ed275c41bd7d6098ae8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 25 08:00:55 2018 -0400 Fix a copy-paste error in the fix for #23693. Found by coverity; CID 25912; bug not in any released Tor. --- src/or/router.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/router.c b/src/or/router.c index f29ebbdf8..5405d3126 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -143,7 +143,7 @@ dup_onion_keys(crypto_pk_t **key, crypto_pk_t **last) if (onionkey) *key = crypto_pk_copy_full(onionkey); else - *last = NULL; + *key = NULL; if (lastonionkey) *last = crypto_pk_copy_full(lastonionkey); else

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 25 Apr '18

25 Apr '18

commit 58f54a3588cf722a31b10fa0450225f7685c8629 Merge: 85cd8386f 7c3f87eb4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 25 08:01:54 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/or/router.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 25 Apr '18

25 Apr '18

commit fb4307bf22067409ea7afd10178a4695490dc185 Merge: 7a55efbd5 7c3f87eb4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 25 08:01:54 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 src/or/router.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 25 Apr '18

25 Apr '18

commit 7c3f87eb4b2c3c4ce3422b3561bee36f3c9956c1 Merge: 89a3fafd4 bb35405d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 25 08:01:53 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 src/or/router.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Fix a copy-paste error in the fix for #23693.
by nickm＠torproject.org 25 Apr '18

25 Apr '18

commit bb35405d2ad01dbc8cf59ed275c41bd7d6098ae8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 25 08:00:55 2018 -0400 Fix a copy-paste error in the fix for #23693. Found by coverity; CID 25912; bug not in any released Tor. --- src/or/router.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/router.c b/src/or/router.c index f29ebbdf8..5405d3126 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -143,7 +143,7 @@ dup_onion_keys(crypto_pk_t **key, crypto_pk_t **last) if (onionkey) *key = crypto_pk_copy_full(onionkey); else - *last = NULL; + *key = NULL; if (lastonionkey) *last = crypto_pk_copy_full(lastonionkey); else

1 0