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

[tor/release-0.3.2] bump to 0.3.2.3-alpha-dev.
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit d5eea977be405b984e651564736179df4b27b31c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 12:33:13 2017 -0400 bump to 0.3.2.3-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 ca2e803ea..592e04a5d 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.3-alpha]) +AC_INIT([tor],[0.3.2.3-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 ef35b312a..4c1f709a2 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.2.3-alpha" +!define VERSION "0.3.2.3-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 6d3f9fd1c..38c6d5118 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.2.3-alpha" +#define VERSION "0.3.2.3-alpha-dev"

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit 080bcfa2390a135f585d5fe386bf08834c16acdb Merge: 023d756bf d5eea977b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 12:33:34 2017 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.3.2] bump to 0.3.2.3-alpha-dev.
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit d5eea977be405b984e651564736179df4b27b31c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 12:33:13 2017 -0400 bump to 0.3.2.3-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 ca2e803ea..592e04a5d 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.3-alpha]) +AC_INIT([tor],[0.3.2.3-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 ef35b312a..4c1f709a2 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.2.3-alpha" +!define VERSION "0.3.2.3-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 6d3f9fd1c..38c6d5118 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.2.3-alpha" +#define VERSION "0.3.2.3-alpha-dev"

1 0

[tor/master] Include rust files in 'make dist'
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit 2153814ba8b28a652ef7cd80a7bdf1516201eaa2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 12:19:31 2017 -0400 Include rust files in 'make dist' --- src/rust/include.am | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/rust/include.am b/src/rust/include.am index 025d921b3..9c4337484 100644 --- a/src/rust/include.am +++ b/src/rust/include.am @@ -3,4 +3,24 @@ include src/rust/tor_rust/include.am EXTRA_DIST +=\ src/rust/Cargo.toml \ src/rust/Cargo.lock \ - src/rust/.cargo/config.in + src/rust/.cargo/config.in \ + src/rust/external/Cargo.toml \ + src/rust/external/external.rs \ + src/rust/external/lib.rs \ + src/rust/protover/Cargo.toml \ + src/rust/protover/ffi.rs \ + src/rust/protover/lib.rs \ + src/rust/protover/protover.rs \ + src/rust/protover/tests/protover.rs \ + src/rust/smartlist/Cargo.toml \ + src/rust/smartlist/lib.rs \ + src/rust/smartlist/smartlist.rs \ + src/rust/tor_allocate/Cargo.toml \ + src/rust/tor_allocate/lib.rs \ + src/rust/tor_allocate/tor_allocate.rs \ + src/rust/tor_rust/Cargo.toml \ + src/rust/tor_rust/include.am \ + src/rust/tor_rust/lib.rs \ + src/rust/tor_util/Cargo.toml \ + src/rust/tor_util/ffi.rs \ + src/rust/tor_util/lib.rs

1 0

[tor/master] bump to 0.3.2.3-alpha-dev.
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit d5eea977be405b984e651564736179df4b27b31c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 12:33:13 2017 -0400 bump to 0.3.2.3-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 ca2e803ea..592e04a5d 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.3-alpha]) +AC_INIT([tor],[0.3.2.3-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 ef35b312a..4c1f709a2 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.2.3-alpha" +!define VERSION "0.3.2.3-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 6d3f9fd1c..38c6d5118 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.2.3-alpha" +#define VERSION "0.3.2.3-alpha-dev"

1 0

[tor/master] repair "make distcheck"
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit 7f764bcba80e7184f0f9f0715e0d125483143f70 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 11:59:15 2017 -0400 repair "make distcheck" --- src/rust/tor_rust/include.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am index 7d30592b0..6bfec77fb 100644 --- a/src/rust/tor_rust/include.am +++ b/src/rust/tor_rust/include.am @@ -1,7 +1,6 @@ EXTRA_DIST +=\ src/rust/tor_rust/Cargo.toml \ - src/rust/tor_rust/lib.rs \ - src/rust/tor_rust/tor_rust.rs + src/rust/tor_rust/lib.rs src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE ( cd "$(abs_top_srcdir)/src/rust/tor_rust" ; \

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit 3cf863df1c29128aa10533d99c897a06dcac9e0c Merge: 2153814ba d5eea977b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 12:33:21 2017 -0400 Merge branch 'maint-0.3.2' "ours" merge to avoid version bump.

1 0

[stem/master] Fix python3 unit test error
by atagar＠torproject.org 27 Oct '17

27 Oct '17

commit a021aae5c6ef16a77d709f131bf6b777e6f938de Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Oct 27 09:10:17 2017 -0700 Fix python3 unit test error Oops, python3 regression slipped in with prior work... ====================================================================== ERROR: test_connections ---------------------------------------------------------------------- Traceback (most recent call last): File "/usr/local/lib/python3.2/dist-packages/mock/mock.py", line 1305, in patched return func(*args, **keywargs) File "/home/atagar/Desktop/stem/test/unit/util/proc.py", line 215, in test_connections tcp = b'%s\n 0: 11111111:1111 22222222:2222 01 44444444:44444444 55:55555555 66666666 1111 8 99999999' % TITLE_LINE TypeError: unsupported operand type(s) for %: 'bytes' and 'bytes' --- test/unit/util/proc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/util/proc.py b/test/unit/util/proc.py index 4c24b279..562d618a 100644 --- a/test/unit/util/proc.py +++ b/test/unit/util/proc.py @@ -212,8 +212,8 @@ class TestProc(unittest.TestCase): '/proc/%s/fd/4' % pid: 'pipe:[40404]', }[param] - tcp = b'%s\n 0: 11111111:1111 22222222:2222 01 44444444:44444444 55:55555555 66666666 1111 8 99999999' % TITLE_LINE - udp = b'%s\n A: BBBBBBBB:BBBB CCCCCCCC:CCCC DD EEEEEEEE:EEEEEEEE FF:FFFFFFFF GGGGGGGG 1111 H IIIIIIII' % TITLE_LINE + tcp = TITLE_LINE + b'\n 0: 11111111:1111 22222222:2222 01 44444444:44444444 55:55555555 66666666 1111 8 99999999' + udp = TITLE_LINE + b'\n A: BBBBBBBB:BBBB CCCCCCCC:CCCC DD EEEEEEEE:EEEEEEEE FF:FFFFFFFF GGGGGGGG 1111 H IIIIIIII' path_exists_mock.side_effect = lambda param: { '/proc/net/tcp': True,

1 0

[tor/master] declare shutdown_did_not_work_callback() with ATTR_NORETURN
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit f803c1bb1761915ca57a4d8c65b2fed79f2a8886 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 11:51:42 2017 -0400 declare shutdown_did_not_work_callback() with ATTR_NORETURN --- src/or/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index bb5935690..b9d261e09 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -143,6 +143,8 @@ static void connection_start_reading_from_linked_conn(connection_t *conn); static int connection_should_read_from_linked_conn(connection_t *conn); static int run_main_loop_until_done(void); static void process_signal(int sig); +static void shutdown_did_not_work_callback(evutil_socket_t fd, short event, + void *arg) ATTR_NORETURN; /********* START VARIABLES **********/ int global_read_bucket; /**< Max number of bytes I can read this second. */

1 0

[webwml/master] bump alpha version
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit ebd9653ec0b4278b6f2c103cfab0f3b5cbdac300 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 11:48:32 2017 -0400 bump alpha version --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 02a4502e..fedfe22b 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # website component, and set it to needs_review. export STABLETAG=tor-0.3.1.8 -export DEVTAG=tor-0.3.2.2-alpha +export DEVTAG=tor-0.3.2.3-alpha WMLBASE=. diff --git a/include/versions.wmi b/include/versions.wmi index afd4f549..140d377b 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.3.1.8</define-tag> -<define-tag version-alpha whitespace=delete>0.3.2.2-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.3.2.3-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.3.1.7</define-tag>

1 0