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

[tor/maint-0.3.4] rust: Expose rand module from crypto crate.
by nickm＠torproject.org 16 Jun '18

16 Jun '18

commit ac5b1428ea9d0a4c59e9c9c11a88019ebae6abf0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 15 21:44:22 2018 +0000 rust: Expose rand module from crypto crate. --- src/rust/crypto/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rust/crypto/lib.rs b/src/rust/crypto/lib.rs index e7e3b22e0..b349664db 100644 --- a/src/rust/crypto/lib.rs +++ b/src/rust/crypto/lib.rs @@ -34,4 +34,5 @@ extern crate libc; extern crate external; pub mod digests; // Unfortunately named "digests" plural to avoid name conflict with the digest crate +pub mod rand;

1 0

[tor/master] Merge remote-tracking branch 'isis/bug26267' into maint-0.3.4
by nickm＠torproject.org 16 Jun '18

16 Jun '18

commit 71ddfbaadd9802ae935208191fbe2605d9146491 Merge: 3dd94a7ea ac5b1428e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 16 12:43:28 2018 -0400 Merge remote-tracking branch 'isis/bug26267' into maint-0.3.4 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/rust/crypto/lib.rs | 1 + src/win32/orconfig.h | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.3.4] Bump master to 0.3.5.0-alpha-dev
by nickm＠torproject.org 16 Jun '18

16 Jun '18

commit e22822e4ae75dc59c7242d84bc306476fbd92a3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 15 17:19:49 2018 -0400 Bump master to 0.3.5.0-alpha-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d554ba8e5..95df1692a 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.2-alpha-dev]) +AC_INIT([tor],[0.3.5.0-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 8181c9424..c9822790b 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.4.2-alpha-dev" +!define VERSION "0.3.5.0-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index a201a76ac..65a905deb 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.4.2-alpha-dev" +#define VERSION "0.3.5.0-alpha-dev"

1 0

[tor/maint-0.3.4] Merge remote-tracking branch 'isis/bug26267' into maint-0.3.4
by nickm＠torproject.org 16 Jun '18

16 Jun '18

commit 71ddfbaadd9802ae935208191fbe2605d9146491 Merge: 3dd94a7ea ac5b1428e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 16 12:43:28 2018 -0400 Merge remote-tracking branch 'isis/bug26267' into maint-0.3.4 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/rust/crypto/lib.rs | 1 + src/win32/orconfig.h | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-)

1 0

[tor/master] rust: Expose rand module from crypto crate.
by nickm＠torproject.org 16 Jun '18

16 Jun '18

commit ac5b1428ea9d0a4c59e9c9c11a88019ebae6abf0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 15 21:44:22 2018 +0000 rust: Expose rand module from crypto crate. --- src/rust/crypto/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rust/crypto/lib.rs b/src/rust/crypto/lib.rs index e7e3b22e0..b349664db 100644 --- a/src/rust/crypto/lib.rs +++ b/src/rust/crypto/lib.rs @@ -34,4 +34,5 @@ extern crate libc; extern crate external; pub mod digests; // Unfortunately named "digests" plural to avoid name conflict with the digest crate +pub mod rand;

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 16 Jun '18

16 Jun '18

commit 5cb45d2c7a845cb27c7afc0734e33b1f1b2497f4 Merge: 97cc61e94 71ddfbaad Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 16 12:43:35 2018 -0400 Merge branch 'maint-0.3.4' src/rust/crypto/lib.rs | 1 + 1 file changed, 1 insertion(+)

1 0

[tor/release-0.3.4] rust: Expose rand module from crypto crate.
by nickm＠torproject.org 16 Jun '18

16 Jun '18

commit ac5b1428ea9d0a4c59e9c9c11a88019ebae6abf0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 15 21:44:22 2018 +0000 rust: Expose rand module from crypto crate. --- src/rust/crypto/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rust/crypto/lib.rs b/src/rust/crypto/lib.rs index e7e3b22e0..b349664db 100644 --- a/src/rust/crypto/lib.rs +++ b/src/rust/crypto/lib.rs @@ -34,4 +34,5 @@ extern crate libc; extern crate external; pub mod digests; // Unfortunately named "digests" plural to avoid name conflict with the digest crate +pub mod rand;

1 0

[tor/release-0.3.4] Bump master to 0.3.5.0-alpha-dev
by nickm＠torproject.org 16 Jun '18

16 Jun '18

commit e22822e4ae75dc59c7242d84bc306476fbd92a3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 15 17:19:49 2018 -0400 Bump master to 0.3.5.0-alpha-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d554ba8e5..95df1692a 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.2-alpha-dev]) +AC_INIT([tor],[0.3.5.0-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 8181c9424..c9822790b 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.4.2-alpha-dev" +!define VERSION "0.3.5.0-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index a201a76ac..65a905deb 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.4.2-alpha-dev" +#define VERSION "0.3.5.0-alpha-dev"

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'isis/bug26267' into maint-0.3.4
by nickm＠torproject.org 16 Jun '18

16 Jun '18

commit 71ddfbaadd9802ae935208191fbe2605d9146491 Merge: 3dd94a7ea ac5b1428e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 16 12:43:28 2018 -0400 Merge remote-tracking branch 'isis/bug26267' into maint-0.3.4 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/rust/crypto/lib.rs | 1 + src/win32/orconfig.h | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.3.4] Make Rust warnings conditionally fatal
by nickm＠torproject.org 16 Jun '18

16 Jun '18

commit 468bf58fa24d78bef8d0d017dcacb7da4c031c12 Author: Taylor Yu <catalyst(a)torproject.org> Date: Fri Jun 15 17:27:19 2018 -0500 Make Rust warnings conditionally fatal Set rustc flags to treat warnings as fatal if configured with --enable-warnings. --- configure.ac | 6 ++++++ src/rust/.cargo/config.in | 3 +++ 2 files changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac index d554ba8e5..5269d9c42 100644 --- a/configure.ac +++ b/configure.ac @@ -462,6 +462,11 @@ if test "x$enable_rust" = "xyes"; then fi AC_DEFINE([HAVE_RUST], 1, [have Rust]) + if test "x$enable_fatal_warnings" = "xyes"; then + RUST_WARN= + else + RUST_WARN=# + fi if test "x$enable_cargo_online_mode" = "xyes"; then CARGO_ONLINE= RUST_DL=# @@ -515,6 +520,7 @@ if test "x$enable_rust" = "xyes"; then AC_SUBST(TOR_RUST_STATIC_NAME) AC_SUBST(CARGO_ONLINE) + AC_SUBST(RUST_WARN) AC_SUBST(RUST_DL) dnl Let's check the rustc version, too diff --git a/src/rust/.cargo/config.in b/src/rust/.cargo/config.in index 301e7fdbe..70481bbcb 100644 --- a/src/rust/.cargo/config.in +++ b/src/rust/.cargo/config.in @@ -6,3 +6,6 @@ @RUST_DL@ [source.vendored-sources] @RUST_DL@ directory = '@TOR_RUST_DEPENDENCIES@' + +@RUST_WARN@ [build] +@RUST_WARN@ rustflags = [ "-D", "warnings" ] \ No newline at end of file

1 0