February 2019 - tor-commits - lists.torproject.org

[tor/release-0.3.3] Start a changelog for 0.3.3.12
by nickm＠torproject.org 21 Feb '19

21 Feb '19

commit 4d67cffcf91e6c5afebfd595391e73cf497da57d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 21 09:49:09 2019 -0500 Start a changelog for 0.3.3.12 --- changes/bug29029 | 5 ----- changes/bug29244 | 4 ---- changes/geoip-2019-02-05 | 4 ---- 3 files changed, 13 deletions(-) diff --git a/changes/bug29029 b/changes/bug29029 deleted file mode 100644 index e100a8c2e..000000000 --- a/changes/bug29029 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (logging, onion services): - - Stop logging "Tried to establish rendezvous on non-OR circuit..." as - a warning. Instead, log it as a protocol warning, because there is - nothing that relay operators can do to fix it. Fixes bug 29029; - bugfix on 0.2.5.7-rc. diff --git a/changes/bug29244 b/changes/bug29244 deleted file mode 100644 index 6206a9546..000000000 --- a/changes/bug29244 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (build, compatibility): - - Update Cargo.lock file to match the version made by the latest - version of Rust, so that "make distcheck" will pass again. - Fixes bug 29244; bugfix on 0.3.3.4-alpha. diff --git a/changes/geoip-2019-02-05 b/changes/geoip-2019-02-05 deleted file mode 100644 index 78ee6d424..000000000 --- a/changes/geoip-2019-02-05 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (geoip): - - Update geoip and geoip6 to the February 5 2019 Maxmind GeoLite2 - Country database. Closes ticket 29478. -

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 21 Feb '19

21 Feb '19

commit 1725699e0613521c7d2802f0bf22a8d40634aa9c Merge: 4d67cffcf 41c2bf590 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 21 09:58:52 2019 -0500 Merge branch 'maint-0.3.3' into release-0.3.3 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/release-0.3.3] Update to 0.3.3.12
by nickm＠torproject.org 21 Feb '19

21 Feb '19

commit 41c2bf590b49e72ba9e9f5818cdbca6bc6069eab Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 21 09:49:48 2019 -0500 Update to 0.3.3.12 --- 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 285bf6bc1..5162a70e6 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.11-dev]) +AC_INIT([tor],[0.3.3.12]) 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 826d60de8..d24d1076b 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.3.11-dev" +!define VERSION "0.3.3.12" !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 b66b0390f..472ab87b6 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.3.11-dev" +#define VERSION "0.3.3.12"

1 0

[tor/master] Bump version to 0.4.0.2-alpha
by nickm＠torproject.org 21 Feb '19

21 Feb '19

commit df3484b2b01835c075b57c30b2ea3ac260ee157c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 21 09:52:27 2019 -0500 Bump version to 0.4.0.2-alpha --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 7de3c3a46..6e60489a5 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.0.1-alpha-dev]) +AC_INIT([tor],[0.4.0.2-alpha]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-01-18"], # for 0.4.0.1-alpha +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-02-21"], # for 0.4.0.2-alpha [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 4f2f82d00..eb961e616 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.4.0.1-alpha-dev" +!define VERSION "0.4.0.2-alpha" !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 c618c5b49..0081bc455 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.4.0.1-alpha-dev" +#define VERSION "0.4.0.2-alpha"

1 0

[tor/maint-0.4.0] Fix a goofy change from abcde10fce that broke test-slow linking
by nickm＠torproject.org 21 Feb '19

21 Feb '19

commit 34183f0d71c2e2d10e3d64291e3bb83a27c2416a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 21 09:06:51 2019 -0500 Fix a goofy change from abcde10fce that broke test-slow linking boklm tracked this down, and it doesn't make sense. It caused This change goes back to the previous LDFLAGS line. --- src/test/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/include.am b/src/test/include.am index 9bfc626b2..d585c2a38 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -259,7 +259,7 @@ src_test_test_LDADD = \ src_test_test_slow_CPPFLAGS = $(src_test_test_CPPFLAGS) src_test_test_slow_CFLAGS = $(src_test_test_CFLAGS) src_test_test_slow_LDADD = $(src_test_test_LDADD) -src_test_test_slow_LDFLAGS = @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ +src_test_test_slow_LDFLAGS = $(src_test_test_LDFLAGS) src_test_test_rng_CPPFLAGS = $(src_test_test_CPPFLAGS) src_test_test_rng_CFLAGS = $(src_test_test_CFLAGS)

1 0

[tor/release-0.4.0] Fix a goofy change from abcde10fce that broke test-slow linking
by nickm＠torproject.org 21 Feb '19

21 Feb '19

commit 34183f0d71c2e2d10e3d64291e3bb83a27c2416a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 21 09:06:51 2019 -0500 Fix a goofy change from abcde10fce that broke test-slow linking boklm tracked this down, and it doesn't make sense. It caused This change goes back to the previous LDFLAGS line. --- src/test/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/include.am b/src/test/include.am index 9bfc626b2..d585c2a38 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -259,7 +259,7 @@ src_test_test_LDADD = \ src_test_test_slow_CPPFLAGS = $(src_test_test_CPPFLAGS) src_test_test_slow_CFLAGS = $(src_test_test_CFLAGS) src_test_test_slow_LDADD = $(src_test_test_LDADD) -src_test_test_slow_LDFLAGS = @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ +src_test_test_slow_LDFLAGS = $(src_test_test_LDFLAGS) src_test_test_rng_CPPFLAGS = $(src_test_test_CPPFLAGS) src_test_test_rng_CFLAGS = $(src_test_test_CFLAGS)

1 0

[tor/master] Merge branch 'maint-0.4.0'
by nickm＠torproject.org 21 Feb '19

21 Feb '19

commit aa79196ee05e4ee8169de2156478e7cfba49ef0e Merge: 59c3910be 34183f0d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 21 09:10:34 2019 -0500 Merge branch 'maint-0.4.0' src/test/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by nickm＠torproject.org 21 Feb '19

21 Feb '19

commit d97548a6fa09d418b93a70b5763e7b9ebe692fb6 Merge: ba8c3735f 34183f0d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 21 09:10:34 2019 -0500 Merge branch 'maint-0.4.0' into release-0.4.0 src/test/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Fix a goofy change from abcde10fce that broke test-slow linking
by nickm＠torproject.org 21 Feb '19

21 Feb '19

commit 34183f0d71c2e2d10e3d64291e3bb83a27c2416a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 21 09:06:51 2019 -0500 Fix a goofy change from abcde10fce that broke test-slow linking boklm tracked this down, and it doesn't make sense. It caused This change goes back to the previous LDFLAGS line. --- src/test/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/include.am b/src/test/include.am index 9bfc626b2..d585c2a38 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -259,7 +259,7 @@ src_test_test_LDADD = \ src_test_test_slow_CPPFLAGS = $(src_test_test_CPPFLAGS) src_test_test_slow_CFLAGS = $(src_test_test_CFLAGS) src_test_test_slow_LDADD = $(src_test_test_LDADD) -src_test_test_slow_LDFLAGS = @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ +src_test_test_slow_LDFLAGS = $(src_test_test_LDFLAGS) src_test_test_rng_CPPFLAGS = $(src_test_test_CPPFLAGS) src_test_test_rng_CFLAGS = $(src_test_test_CFLAGS)

1 0

[webwml/master] Revert "Set Android version to 8.5a7"
by boklm＠torproject.org 21 Feb '19

21 Feb '19

commit 9291dda356a90c6ac712ce017c6384a51a8f93fa Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 21 10:33:35 2019 +0100 Revert "Set Android version to 8.5a7" This reverts commit 63a5b5bccf84dcf30352527648a444ddb7a5368d. --- include/versions.wmi | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 18d12499..13429dc3 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -41,12 +41,8 @@ <let releasedate-torbrowserbundlelinux64beta=releasedate-torbrowserbundlebeta-all /> <let version-torbrowserbundleosx64beta=version-torbrowserbundlebeta-all /> <let releasedate-torbrowserbundleosx64beta=releasedate-torbrowserbundlebeta-all /> - -<define-tag version-torbrowserbundleandroidbeta whitespace=delete>8.5a7</define-tag> -<define-tag releasedate-torbrowserbundleandroidbeta whitespace=delete>2019-01-30</define-tag> <define-tag file-source-stable whitespace=delete>tor-<version-stable>.tar.gz</define-tag> <define-tag package-source-stable whitespace=delete>../dist/<file-source-stable></define-tag>

1 0