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

[tor/master] Change `allocate_and_copy_string` to take a `&str` instead of `&String`.
by nickm＠torproject.org 14 Jul '18

14 Jul '18

commit 7e9c37f9cb33d937a664dec83ee28da447a41aa6 Author: Corey Farwell <coreyf(a)rwell.org> Date: Sun Jun 24 08:58:26 2018 -0400 Change `allocate_and_copy_string` to take a `&str` instead of `&String`. --- src/rust/protover/ffi.rs | 3 +-- src/rust/tor_allocate/tor_allocate.rs | 12 +++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index cd49e5f93..0470cd487 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -198,8 +198,7 @@ pub extern "C" fn protover_compute_vote( ) -> *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 diff --git a/src/rust/tor_allocate/tor_allocate.rs b/src/rust/tor_allocate/tor_allocate.rs index 47fa5fc59..d0c0d7994 100644 --- a/src/rust/tor_allocate/tor_allocate.rs +++ b/src/rust/tor_allocate/tor_allocate.rs @@ -9,9 +9,9 @@ use libc::c_void; // Define a no-op implementation for testing Rust modules without linking to C #[cfg(feature = "testing")] -pub fn allocate_and_copy_string(s: &String) -> *mut c_char { +pub fn allocate_and_copy_string(s: &str) -> *mut c_char { use std::ffi::CString; - CString::new(s.as_str()).unwrap().into_raw() + CString::new(s).unwrap().into_raw() } // Defined only for tests, used for testing purposes, so that we don't need @@ -39,7 +39,7 @@ extern "C" { /// A `*mut c_char` that should be freed by tor_free in C /// #[cfg(not(feature = "testing"))] -pub fn allocate_and_copy_string(src: &String) -> *mut c_char { +pub fn allocate_and_copy_string(src: &str) -> *mut c_char { let bytes: &[u8] = src.as_bytes(); let size = mem::size_of_val::<[u8]>(bytes); @@ -77,8 +77,7 @@ mod test { use tor_allocate::allocate_and_copy_string; - let empty = String::new(); - let allocated_empty = allocate_and_copy_string(&empty); + let allocated_empty = allocate_and_copy_string(""); let allocated_empty_rust = unsafe { CStr::from_ptr(allocated_empty).to_str().unwrap() }; @@ -95,8 +94,7 @@ mod test { use tor_allocate::allocate_and_copy_string; - let empty = String::from("foo bar biz"); - let allocated_empty = allocate_and_copy_string(&empty); + let allocated_empty = allocate_and_copy_string("foo bar biz"); let allocated_empty_rust = unsafe { CStr::from_ptr(allocated_empty).to_str().unwrap() };

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/179'
by nickm＠torproject.org 14 Jul '18

14 Jul '18

commit f608cc0f31d6fc99f4059d14adeba286ea82b808 Merge: baff5e2b9 7585523cf Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 13 18:30:17 2018 -0400 Merge remote-tracking branch 'tor-github/pr/179' changes/ticket26492 | 4 +++ src/rust/protover/ffi.rs | 62 +++++++++++++++++------------------ src/rust/tor_allocate/tor_allocate.rs | 12 +++---- 3 files changed, 40 insertions(+), 38 deletions(-)

1 0

[tor/master] Add changes file for ticket 26492
by nickm＠torproject.org 14 Jul '18

14 Jul '18

commit 7585523cfc245cd7d4a5ee394367a4f8850c662e Author: Taylor Yu <catalyst(a)torproject.org> Date: Fri Jul 13 12:34:23 2018 -0500 Add changes file for ticket 26492 --- changes/ticket26492 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket26492 b/changes/ticket26492 new file mode 100644 index 000000000..c6ab292d1 --- /dev/null +++ b/changes/ticket26492 @@ -0,0 +1,4 @@ + o Minor features (rust, code quality): + - Improve rust code quality in the Rust protover implementation by + making it more idiomatic. Includes changing an internal API to + take &str instead of &String. Closes ticket 26492.

1 0

[torspec/master] Authorship update for prop295
by nickm＠torproject.org 13 Jul '18

13 Jul '18

commit d6b2bcb5b2ac1b1ca9726a368c489c152e093332 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 13 17:05:41 2018 -0400 Authorship update for prop295 --- proposals/295-relay-crypto-with-atl.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/295-relay-crypto-with-atl.txt b/proposals/295-relay-crypto-with-atl.txt index 73eb98b..d2a24db 100644 --- a/proposals/295-relay-crypto-with-atl.txt +++ b/proposals/295-relay-crypto-with-atl.txt @@ -1,6 +1,6 @@ Filename: 295-relay-crypto-with-atl.txt Title: Using ADL-GCM for relay cryptography (solving the crypto-tagging attack) -Author: Tomer Ashur +Author: Tomer Ashur, Orr Dunkelman, Atul Lyukx Created: 09 Apr 2018 Status: Open

1 0

[tor/release-0.3.4] bump to 0.3.4.5-rc-dev now that the release is out
by arma＠torproject.org 13 Jul '18

13 Jul '18

commit 0d3d2f2e19a113cd47f1856b147f0c52bb88c815 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Jul 13 17:01:17 2018 -0400 bump to 0.3.4.5-rc-dev now that the release is out --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index e08e22f1d..4f930ca61 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.4.5-rc]) +AC_INIT([tor],[0.3.4.5-rc-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4])

1 0

[tor/release-0.3.3] bump to 0.3.3.9-dev now that the release is out
by arma＠torproject.org 13 Jul '18

13 Jul '18

commit 9e6f21c74ac0068ad9cc6115b4a29b5cd237ad62 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Jul 13 17:00:49 2018 -0400 bump to 0.3.3.9-dev now that the release is out --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 2aa4272ac..77789811d 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.3.9]) +AC_INIT([tor],[0.3.3.9-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4])

1 0

[tor/release-0.3.2] bump to 0.3.2.11-dev now that the release is out
by arma＠torproject.org 13 Jul '18

13 Jul '18

commit 8747627d8a90f666e8e5a38b2fd97a749b946e78 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Jul 13 17:00:22 2018 -0400 bump to 0.3.2.11-dev now that the release is out --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 9424c6c14..aefd48ddc 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.2.11]) +AC_INIT([tor],[0.3.2.11-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4])

1 0

[tor/release-0.2.9] bump to 0.2.9.16-dev now that the release is out
by arma＠torproject.org 13 Jul '18

13 Jul '18

commit ea2103812478097a6a81c0435b1ede65ea6b2796 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Jul 13 16:59:41 2018 -0400 bump to 0.2.9.16-dev now that the release is out --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f90480cd7..7e2c1dec8 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.9.16]) +AC_INIT([tor],[0.2.9.16-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4])

1 0

[tor/master] Faravahar hasn't been voting on versions for a while now
by arma＠torproject.org 13 Jul '18

13 Jul '18

commit baff5e2b9d3e9562dc91e0f7fd7ecd5b5a74a967 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Jul 13 16:58:46 2018 -0400 Faravahar hasn't been voting on versions for a while now --- doc/HACKING/ReleasingTor.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index e70416c35..55a40fc89 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -7,7 +7,7 @@ new Tor release: === 0. Preliminaries -1. Get at least three of weasel/arma/Sebastian/Sina to put the new +1. Get at least two of weasel/arma/Sebastian to put the new version number in their approved versions list. Give them a few days to do this if you can.

1 0

[webwml/master] new releases are available (for the new bridge authority)
by arma＠torproject.org 13 Jul '18

13 Jul '18

commit 53fe9a76f27ddea8691696ff8f6addd0c1a4fe91 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Jul 13 15:07:03 2018 -0400 new releases are available (for the new bridge authority) --- Makefile | 4 ++-- include/versions.wmi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7bf740ea..edcf4329 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ # branch to your personal webwml repository, open a trac ticket in the # website component, and set it to needs_review. -export STABLETAG=tor-0.3.3.8 -export DEVTAG=tor-0.3.4.4-rc +export STABLETAG=tor-0.3.3.9 +export DEVTAG=tor-0.3.4.5-rc WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate docs/torbutton diff --git a/include/versions.wmi b/include/versions.wmi index 2db70b94..bb234cd5 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ -<define-tag version-stable whitespace=delete>0.3.3.8</define-tag> -<define-tag version-alpha whitespace=delete>0.3.4.4-rc</define-tag> +<define-tag version-stable whitespace=delete>0.3.3.9</define-tag> +<define-tag version-alpha whitespace=delete>0.3.4.5-rc</define-tag> <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.5</define-tag>

1 0