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

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 30 Oct '18

30 Oct '18

commit 16efa1eddfeffac81a2a455cefadb0bbf237a519 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 30 14:15:20 2018 +0000 Update translations for donatepages-messagespot --- locale/es_AR/LC_MESSAGES/messages.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/es_AR/LC_MESSAGES/messages.po b/locale/es_AR/LC_MESSAGES/messages.po index 50c08cbc2..890f7e1a1 100644 --- a/locale/es_AR/LC_MESSAGES/messages.po +++ b/locale/es_AR/LC_MESSAGES/messages.po @@ -513,7 +513,7 @@ msgstr "Remera" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:449 msgid "Choose your size and fit for each shirt." -msgstr "Elegí tu talle y estilo por cada remera." +msgstr "Elegí tu talle y estilo para cada remera." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:453 msgid "" @@ -541,7 +541,7 @@ msgid "" "again." msgstr "" "Falta completar en el formulario un campo requerido. Por favor recargá la " -"página y tratá de nuevo." +"página e intenta de nuevo." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:473 msgid "There was a problem submitting your request to the server:<br>"

1 0

[tor/maint-0.3.4] Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit 038bc21f8894043fbdda0cc87adddfbad84f65c4 Merge: 8013e3e8b 80ad15921 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:33:36 2018 -0400 Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3 changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.3.4] Remove extraneous argument from Rust protover_compute_vote()
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit 80ad15921cef42ac12da356584f217d2ead5cb09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 17 11:50:46 2018 -0400 Remove extraneous argument from Rust protover_compute_vote() This argument was added to match an older idea for the C api, but we decided not to do it that way in C. Fixes bug 27741; bugfix on 0.3.3.6 / TROVE-2018-005 fix. --- changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/changes/bug27741 b/changes/bug27741 new file mode 100644 index 000000000..531e264b6 --- /dev/null +++ b/changes/bug27741 @@ -0,0 +1,5 @@ + o Minor bugfixes (rust, directory authority): + - Fix an API mismatch in the rust implementation of + protover_compute_vote(). This bug could have caused crashes on any + directory authorities running Tor with Rust (which we do not yet + recommend). Fixes bug 27741; bugfix on 0.3.3.6. diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index 9656e8c31..f803bd015 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -207,8 +207,7 @@ pub extern "C" fn protover_get_supported_protocols() -> *const c_char { #[no_mangle] pub extern "C" fn protover_compute_vote( list: *const Stringlist, - threshold: c_int, - allow_long_proto_names: bool, + threshold: c_int ) -> *mut c_char { if list.is_null() { @@ -223,13 +222,9 @@ pub extern "C" fn protover_compute_vote( let mut proto_entries: Vec<UnvalidatedProtoEntry> = Vec::new(); for datum in data { - let entry: UnvalidatedProtoEntry = match allow_long_proto_names { - true => match UnvalidatedProtoEntry::from_str_any_len(datum.as_str()) { - Ok(n) => n, - Err(_) => continue}, - false => match datum.parse() { - Ok(n) => n, - Err(_) => continue}, + let entry: UnvalidatedProtoEntry = match datum.parse() { + Ok(n) => n, + Err(_) => continue }; proto_entries.push(entry); }

1 0

[tor/maint-0.3.3] Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit 038bc21f8894043fbdda0cc87adddfbad84f65c4 Merge: 8013e3e8b 80ad15921 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:33:36 2018 -0400 Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3 changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit cf2cb783b77bf9a84c6485b492ebb7e09914b74f Merge: c4b6b5738 038bc21f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:34:04 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.3.5] Remove extraneous argument from Rust protover_compute_vote()
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit 80ad15921cef42ac12da356584f217d2ead5cb09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 17 11:50:46 2018 -0400 Remove extraneous argument from Rust protover_compute_vote() This argument was added to match an older idea for the C api, but we decided not to do it that way in C. Fixes bug 27741; bugfix on 0.3.3.6 / TROVE-2018-005 fix. --- changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/changes/bug27741 b/changes/bug27741 new file mode 100644 index 000000000..531e264b6 --- /dev/null +++ b/changes/bug27741 @@ -0,0 +1,5 @@ + o Minor bugfixes (rust, directory authority): + - Fix an API mismatch in the rust implementation of + protover_compute_vote(). This bug could have caused crashes on any + directory authorities running Tor with Rust (which we do not yet + recommend). Fixes bug 27741; bugfix on 0.3.3.6. diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index 9656e8c31..f803bd015 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -207,8 +207,7 @@ pub extern "C" fn protover_get_supported_protocols() -> *const c_char { #[no_mangle] pub extern "C" fn protover_compute_vote( list: *const Stringlist, - threshold: c_int, - allow_long_proto_names: bool, + threshold: c_int ) -> *mut c_char { if list.is_null() { @@ -223,13 +222,9 @@ pub extern "C" fn protover_compute_vote( let mut proto_entries: Vec<UnvalidatedProtoEntry> = Vec::new(); for datum in data { - let entry: UnvalidatedProtoEntry = match allow_long_proto_names { - true => match UnvalidatedProtoEntry::from_str_any_len(datum.as_str()) { - Ok(n) => n, - Err(_) => continue}, - false => match datum.parse() { - Ok(n) => n, - Err(_) => continue}, + let entry: UnvalidatedProtoEntry = match datum.parse() { + Ok(n) => n, + Err(_) => continue }; proto_entries.push(entry); }

1 0

[tor/maint-0.3.5] Merge remote-tracking branch 'nickm/bug27741_033' into bug27741_035
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit 7bf9c93ab3af5be6f0881d4bc21fd8d72becff96 Merge: 1ae911660 80ad15921 Author: teor <teor(a)torproject.org> Date: Tue Sep 18 23:32:57 2018 +1000 Merge remote-tracking branch 'nickm/bug27741_033' into bug27741_035 Resolve conflicts due to rustfmt, and run rustfmt on the merged code. changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 19 ++++--------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --cc src/rust/protover/ffi.rs index 0c28d032c,f803bd015..940f92332 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@@ -184,13 -205,14 +184,9 @@@ pub extern "C" fn protover_get_supporte // // Why is the threshold a signed integer? —isis #[no_mangle] --pub extern "C" fn protover_compute_vote( -- list: *const Stringlist, - threshold: c_int, - allow_long_proto_names: bool, - threshold: c_int --) -> *mut c_char { - ++pub extern "C" fn protover_compute_vote(list: *const Stringlist, threshold: c_int) -> *mut c_char { if list.is_null() { - let empty = String::new(); - return allocate_and_copy_string(&empty); + return allocate_and_copy_string(""); } // Dereference of raw pointer requires an unsafe block. The pointer is @@@ -200,16 -222,9 +196,9 @@@ let mut proto_entries: Vec<UnvalidatedProtoEntry> = Vec::new(); for datum in data { - let entry: UnvalidatedProtoEntry = if allow_long_proto_names { - match UnvalidatedProtoEntry::from_str_any_len(datum.as_str()) { - Ok(n) => n, - Err(_) => continue, - } - } else { - match datum.parse() { - Ok(n) => n, - Err(_) => continue, - } + let entry: UnvalidatedProtoEntry = match datum.parse() { - Ok(n) => n, - Err(_) => continue ++ Ok(n) => n, ++ Err(_) => continue, }; proto_entries.push(entry); }

1 0

[tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit 3a05b5acdc4a40eae6016ab94067bf5dde92e5fe Merge: 97324a731 cf2cb783b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:35:11 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5

1 0

[tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit 038bc21f8894043fbdda0cc87adddfbad84f65c4 Merge: 8013e3e8b 80ad15921 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:33:36 2018 -0400 Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3 changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit cf2cb783b77bf9a84c6485b492ebb7e09914b74f Merge: c4b6b5738 038bc21f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:34:04 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-)

1 0