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

[tor/master] Merge branch 'bug22520_031' into maint-0.3.1
by nickm＠torproject.org 13 Jul '17

13 Jul '17

commit 1ea155b28fbe15408d96019ef0a75fe0c74ac39d Merge: e6d2059 63ceadb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 13 16:52:16 2017 -0400 Merge branch 'bug22520_031' into maint-0.3.1 changes/bug22520 | 5 +++++ src/common/compat.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Use LANG_ENGLISH in windows error messages
by nickm＠torproject.org 13 Jul '17

13 Jul '17

commit 63ceadb485f6618da99e8a3b7822ede8da27989d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 13:11:18 2017 -0400 Use LANG_ENGLISH in windows error messages This change prevents us from generating corrupt messages when we are confused about codepage settings, and makes Windows errors consistent with the rest of our logs. Fixes bug 22520; bugfix on 0.1.2.8-alpha. Patch from "Vort". --- changes/bug22520 | 5 +++++ src/common/compat.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug22520 b/changes/bug22520 new file mode 100644 index 0000000..cc14f72 --- /dev/null +++ b/changes/bug22520 @@ -0,0 +1,5 @@ + o Minor bugfixes (error reporting, windows): + - When formatting Windows error messages, use the English format + to avoid codepage issues. Fixes bug 22520; bugfix on + 0.1.2.8-alpha. Patch from "Vort". + diff --git a/src/common/compat.c b/src/common/compat.c index 3bea626..4d110ab 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -3261,7 +3261,7 @@ format_win32_error(DWORD err) FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, err, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), (LPVOID)&str, 0, NULL);

1 0

[tor/release-0.3.1] Use LANG_ENGLISH in windows error messages
by nickm＠torproject.org 13 Jul '17

13 Jul '17

commit 63ceadb485f6618da99e8a3b7822ede8da27989d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 13:11:18 2017 -0400 Use LANG_ENGLISH in windows error messages This change prevents us from generating corrupt messages when we are confused about codepage settings, and makes Windows errors consistent with the rest of our logs. Fixes bug 22520; bugfix on 0.1.2.8-alpha. Patch from "Vort". --- changes/bug22520 | 5 +++++ src/common/compat.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug22520 b/changes/bug22520 new file mode 100644 index 0000000..cc14f72 --- /dev/null +++ b/changes/bug22520 @@ -0,0 +1,5 @@ + o Minor bugfixes (error reporting, windows): + - When formatting Windows error messages, use the English format + to avoid codepage issues. Fixes bug 22520; bugfix on + 0.1.2.8-alpha. Patch from "Vort". + diff --git a/src/common/compat.c b/src/common/compat.c index 3bea626..4d110ab 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -3261,7 +3261,7 @@ format_win32_error(DWORD err) FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, err, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), (LPVOID)&str, 0, NULL);

1 0

[tor/maint-0.3.1] Merge branch 'bug22520_031' into maint-0.3.1
by nickm＠torproject.org 13 Jul '17

13 Jul '17

commit 1ea155b28fbe15408d96019ef0a75fe0c74ac39d Merge: e6d2059 63ceadb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 13 16:52:16 2017 -0400 Merge branch 'bug22520_031' into maint-0.3.1 changes/bug22520 | 5 +++++ src/common/compat.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Use LANG_ENGLISH in windows error messages
by nickm＠torproject.org 13 Jul '17

13 Jul '17

commit 63ceadb485f6618da99e8a3b7822ede8da27989d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 13:11:18 2017 -0400 Use LANG_ENGLISH in windows error messages This change prevents us from generating corrupt messages when we are confused about codepage settings, and makes Windows errors consistent with the rest of our logs. Fixes bug 22520; bugfix on 0.1.2.8-alpha. Patch from "Vort". --- changes/bug22520 | 5 +++++ src/common/compat.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug22520 b/changes/bug22520 new file mode 100644 index 0000000..cc14f72 --- /dev/null +++ b/changes/bug22520 @@ -0,0 +1,5 @@ + o Minor bugfixes (error reporting, windows): + - When formatting Windows error messages, use the English format + to avoid codepage issues. Fixes bug 22520; bugfix on + 0.1.2.8-alpha. Patch from "Vort". + diff --git a/src/common/compat.c b/src/common/compat.c index 3bea626..4d110ab 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -3261,7 +3261,7 @@ format_win32_error(DWORD err) FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, err, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), (LPVOID)&str, 0, NULL);

1 0

[tor/release-0.3.1] Merge branch 'bug22520_031' into maint-0.3.1
by nickm＠torproject.org 13 Jul '17

13 Jul '17

commit 1ea155b28fbe15408d96019ef0a75fe0c74ac39d Merge: e6d2059 63ceadb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 13 16:52:16 2017 -0400 Merge branch 'bug22520_031' into maint-0.3.1 changes/bug22520 | 5 +++++ src/common/compat.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 13 Jul '17

13 Jul '17

commit ec29cae8d7e97d652a87d753d93e4289e5a0ed26 Merge: c73b35d 1ea155b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 13 16:52:20 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22520 | 5 +++++ src/common/compat.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 13 Jul '17

13 Jul '17

commit 11b2d36db3b14fb1fd17b021757764bb898b7440 Merge: 4d52b74 1ea155b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 13 16:52:20 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22520 | 5 +++++ src/common/compat.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] use CARGO_HOME instead of HOME when building with rust
by nickm＠torproject.org 13 Jul '17

13 Jul '17

commit eb355e031e86a229b8d8375a5112f8484198373b Author: Chelsea H. Komlo <chelsea.komlo(a)gmail.com> Date: Sun Jul 9 22:33:34 2017 -0400 use CARGO_HOME instead of HOME when building with rust --- src/rust/tor_util/include.am | 2 +- src/test/test_rust.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rust/tor_util/include.am b/src/rust/tor_util/include.am index 17a755f..f0cd639 100644 --- a/src/rust/tor_util/include.am +++ b/src/rust/tor_util/include.am @@ -7,7 +7,7 @@ EXTRA_DIST +=\ src/rust/target/release/libtor_util.a: FORCE ( cd "$(abs_top_srcdir)/src/rust/tor_util" ; \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ - HOME="$(abs_top_builddir)/src/rust" \ + CARGO_HOME="$(abs_top_builddir)/src/rust" \ $(CARGO) build --release --quiet $(CARGO_ONLINE) ) FORCE: diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 4427c70..d559f94 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -7,7 +7,7 @@ exitcode=0 for crate in $crates; do cd "${abs_top_srcdir:-.}/src/rust/${crate}" - CARGO_TARGET_DIR="${abs_top_builddir}/src/rust/target" HOME="${abs_top_builddir}/src/rust" "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} || exitcode=1 + CARGO_TARGET_DIR="${abs_top_builddir}/src/rust/target" CARGO_HOME="${abs_top_builddir}/src/rust" "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} || exitcode=1 done exit $exitcode

1 0

[tor/maint-0.3.1] Add a changes file for bug22830.
by nickm＠torproject.org 13 Jul '17

13 Jul '17

commit 8de1b94b9db9156e1d8cdce9fab8a911cdb1ee43 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jul 13 18:01:54 2017 +0000 Add a changes file for bug22830. --- changes/bug22830 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug22830 b/changes/bug22830 new file mode 100644 index 0000000..123b725 --- /dev/null +++ b/changes/bug22830 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix a problem with Rust toolchains not being found when building + without --enable-cargo-online-mode, due to setting the $HOME + environment variable instead of $CARGO_HOME. Fixes bug 22830; + fix by Chelsea Komlo. Bugfix on 0.3.1.1-alpha.

1 0