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

[tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1130' into maint-0.4.1
by nickm＠torproject.org 24 Jun '19

24 Jun '19

commit 8803930de8c5845fdb56614fbec32604ad64bf6d Merge: aab5f42ae 8356cc5b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 24 13:36:10 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1130' into maint-0.4.1 changes/bug30956 | 4 ++++ doc/tor.1.txt | 6 ++++-- src/feature/relay/router.c | 17 +++++++++++------ 3 files changed, 19 insertions(+), 8 deletions(-)

1 0

[tor/master] stats: Always publish pluggable transports in extra info documents
by nickm＠torproject.org 24 Jun '19

24 Jun '19

commit 8356cc5b514a5d6a0170927d7c3730e2e1164298 Author: teor <teor(a)torproject.org> Date: Mon Jun 24 19:44:24 2019 +1000 stats: Always publish pluggable transports in extra info documents Always publish bridge pluggable transport information in the extra info descriptor, even if ExtraInfoStatistics is 0. This information is needed by BridgeDB. Fixes bug 30956; bugfix on 0.4.1.1-alpha. --- changes/bug30956 | 4 ++++ doc/tor.1.txt | 6 ++++-- src/feature/relay/router.c | 17 +++++++++++------ 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/changes/bug30956 b/changes/bug30956 new file mode 100644 index 000000000..8f52a81de --- /dev/null +++ b/changes/bug30956 @@ -0,0 +1,4 @@ + o Minor bugfixes (pluggable transports): + - Always publish bridge pluggable transport information in the extra info + descriptor, even if ExtraInfoStatistics is 0. This information is + needed by BridgeDB. Fixes bug 30956; bugfix on 0.4.1.1-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 4bd365c77..95d56c6db 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2451,8 +2451,10 @@ is non-zero): [[ExtraInfoStatistics]] **ExtraInfoStatistics** **0**|**1**:: When this option is enabled, Tor includes previously gathered statistics in its extra-info documents that it uploads to the directory authorities. - Disabling this option also disables bandwidth usage statistics, GeoIPFile - hashes, and ServerTransportPlugin lists in the extra-info file. + Disabling this option also removes bandwidth usage statistics, and + GeoIPFile and GeoIPv6File hashes from the extra-info file. Bridge + ServerTransportPlugin lines are always includes in the extra-info file, + because they are required by BridgeDB. (Default: 1) [[ExtendAllowPrivateAddresses]] **ExtendAllowPrivateAddresses** **0**|**1**:: diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index e0daf34db..25bb1835c 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -3175,6 +3175,15 @@ extrainfo_dump_to_string(char **s_out, extrainfo_t *extrainfo, published); smartlist_add(chunks, pre); + /* Add information about the pluggable transports we support, even if we + * are not publishing statistics. This information is needed by BridgeDB + * to distribute bridges. */ + if (options->ServerTransportPlugin) { + char *pluggable_transports = pt_get_extra_info_descriptor_string(); + if (pluggable_transports) + smartlist_add(chunks, pluggable_transports); + } + if (options->ExtraInfoStatistics && write_stats_to_extrainfo) { log_info(LD_GENERAL, "Adding stats to extra-info descriptor."); /* Bandwidth usage stats don't have their own option */ @@ -3182,6 +3191,7 @@ extrainfo_dump_to_string(char **s_out, extrainfo_t *extrainfo, contents = rep_hist_get_bandwidth_lines(); smartlist_add(chunks, contents); } + /* geoip hashes aren't useful unless we are publishing other stats */ if (geoip_is_loaded(AF_INET)) smartlist_add_asprintf(chunks, "geoip-db-digest %s\n", geoip_db_digest(AF_INET)); @@ -3223,12 +3233,7 @@ extrainfo_dump_to_string(char **s_out, extrainfo_t *extrainfo, if (contents) smartlist_add(chunks, contents); } - /* Add information about the pluggable transports we support. */ - if (options->ServerTransportPlugin) { - char *pluggable_transports = pt_get_extra_info_descriptor_string(); - if (pluggable_transports) - smartlist_add(chunks, pluggable_transports); - } + /* bridge statistics */ if (should_record_bridge_info(options)) { const char *bridge_stats = geoip_get_bridge_stats_extrainfo(now); if (bridge_stats) {

1 0

[snowflake/master] Use system font stack in the webextension
by arlo＠torproject.org 24 Jun '19

24 Jun '19

commit a70f5b9181c4805ef10e13495c94d7e145435a81 Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Jun 24 13:25:51 2019 -0400 Use system font stack in the webextension --- proxy/webext/popup.css | 1 + 1 file changed, 1 insertion(+) diff --git a/proxy/webext/popup.css b/proxy/webext/popup.css index dca805c..df526d9 100644 --- a/proxy/webext/popup.css +++ b/proxy/webext/popup.css @@ -1,5 +1,6 @@ body { margin: 1em; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; } #active {

1 0

[tor/release-0.4.1] bump to 0.4.1.3-alpha
by nickm＠torproject.org 24 Jun '19

24 Jun '19

commit aab5f42ae01cb33ec32ff02f1468bb0360d341e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 24 09:32:46 2019 -0400 bump to 0.4.1.3-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 05b932973..107f676bd 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.1.2-alpha-dev]) +AC_INIT([tor],[0.4.1.3-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-06-06"], # for 0.4.1.2-alpha-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-06-24"], # for 0.4.1.3-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 700744d95..da4aea718 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.1.2-alpha-dev" +!define VERSION "0.4.1.3-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 768c6210c..a90a212b4 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.1.2-alpha-dev" +#define VERSION "0.4.1.3-alpha"

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 24 Jun '19

24 Jun '19

commit ec2af981dd47c305a94d3406f7ee17515ad1836e Merge: d7460667a aab5f42ae Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 24 09:33:15 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.4.1] bump to 0.4.1.3-alpha
by nickm＠torproject.org 24 Jun '19

24 Jun '19

commit aab5f42ae01cb33ec32ff02f1468bb0360d341e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 24 09:32:46 2019 -0400 bump to 0.4.1.3-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 05b932973..107f676bd 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.1.2-alpha-dev]) +AC_INIT([tor],[0.4.1.3-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-06-06"], # for 0.4.1.2-alpha-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-06-24"], # for 0.4.1.3-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 700744d95..da4aea718 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.1.2-alpha-dev" +!define VERSION "0.4.1.3-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 768c6210c..a90a212b4 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.1.2-alpha-dev" +#define VERSION "0.4.1.3-alpha"

1 0

[tor/master] bump to 0.4.1.3-alpha
by nickm＠torproject.org 24 Jun '19

24 Jun '19

commit aab5f42ae01cb33ec32ff02f1468bb0360d341e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 24 09:32:46 2019 -0400 bump to 0.4.1.3-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 05b932973..107f676bd 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.1.2-alpha-dev]) +AC_INIT([tor],[0.4.1.3-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-06-06"], # for 0.4.1.2-alpha-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-06-24"], # for 0.4.1.3-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 700744d95..da4aea718 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.1.2-alpha-dev" +!define VERSION "0.4.1.3-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 768c6210c..a90a212b4 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.1.2-alpha-dev" +#define VERSION "0.4.1.3-alpha"

1 0

[tor/master] Merge branch 'maint-0.4.1'
by nickm＠torproject.org 24 Jun '19

24 Jun '19

commit 3b6bd768d374340e667b42fad07a51094abb38a7 Merge: 70415c9f7 aab5f42ae Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 24 09:32:54 2019 -0400 Merge branch 'maint-0.4.1' "ours" to avoid version bump.

1 0

[tor/release-0.4.1] Begin a changelog for 0.4.1.3-alpha
by nickm＠torproject.org 24 Jun '19

24 Jun '19

commit d7460667a95feb8f14f43fd1be472a276796611c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 24 09:26:56 2019 -0400 Begin a changelog for 0.4.1.3-alpha --- ChangeLog | 43 +++++++++++++++++++++++++++++++++++++++++++ changes/bug22619 | 3 --- changes/bug29034 | 5 ----- changes/bug30713 | 5 ----- changes/bug30744 | 3 --- changes/bug30781 | 4 ---- changes/doc30630 | 3 --- changes/geoip-2019-06-10 | 4 ---- changes/ticket30686 | 5 ----- 9 files changed, 43 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index d44ce316c..2fb555c63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,46 @@ +Changes in version 0.4.1.3-alpha - 2019-06-24 + Tor 0.4.1.3-alpha resolves numerous bugs left over from the previous + alpha, most of them from earlier release series. + + o Major bugfixes (Onion service reachability): + - Properly clean up the introduction point map when circuits change + purpose from onion service circuits to pathbias, measurement, or + other circuit types. This should fix some service-side instances + of introduction point failure. Fixes bug 29034; bugfix + on 0.3.2.1-alpha. + + o Minor features (geoip): + - Update geoip and geoip6 to the June 10 2019 Maxmind GeoLite2 + Country database. Closes ticket 30852. + + o Minor features (logging): + - Give a more useful assertion failure message if we think we have + minherit() but we fail to make a region non-inheritable. Give a + compile-time warning if our support for minherit() is incomplete. + Closes ticket 30686. + + o Minor bugfixes (circuit isolation): + - Fix a logic error that prevented the SessionGroup sub-option from + being accepted. Fixes bug 22619; bugfix on 0.2.7.2-alpha. + + o Minor bugfixes (continuous integration): + - Allow the test-stem job to fail in Travis, because it sometimes + hangs. Fixes bug 30744; bugfix on 0.3.5.4-alpha. + - Skip test_rebind on macOS in Travis, because it is unreliable on + macOS on Travis. Fixes bug 30713; bugfix on 0.3.5.1-alpha. + - Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental + variable is set. Fixes bug 30713; bugfix on 0.3.5.1-alpha. + + o Minor bugfixes (directory authorities): + - Stop crashing after parsing an unknown descriptor purpose + annotation. We think this bug can only be triggered by modifying a + local file. Fixes bug 30781; bugfix on 0.2.0.8-alpha. + + o Documentation: + - Mention URLs for Travis/Appveyor/Jenkins in ReleasingTor.md. + Closes ticket 30630. + + Changes in version 0.4.1.2-alpha - 2019-06-06 Tor 0.4.1.2-alpha resolves numerous bugs--some of them from the previous alpha, and some much older. It also contains minor testing diff --git a/changes/bug22619 b/changes/bug22619 deleted file mode 100644 index 9c71996f5..000000000 --- a/changes/bug22619 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (circuit isolation): - - Fix a logic error that prevented the SessionGroup sub-option from - being accepted. Fixes bug 22619; bugfix on 0.2.7.2-alpha. diff --git a/changes/bug29034 b/changes/bug29034 deleted file mode 100644 index e7aa9af00..000000000 --- a/changes/bug29034 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes (Onion service reachability): - - Properly clean up the introduction point map when circuits change purpose - from onion service circuits to pathbias, measurement, or other circuit types. - This should fix some service-side instances of introduction point failure. - Fixes bug 29034; bugfix on 0.3.2.1-alpha. diff --git a/changes/bug30713 b/changes/bug30713 deleted file mode 100644 index e00b98da6..000000000 --- a/changes/bug30713 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (testing): - - Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable is - set. Fixes bug 30713; bugfix on 0.3.5.1-alpha. - - Skip test_rebind on macOS in Travis, because it is unreliable on - macOS on Travis. Fixes bug 30713; bugfix on 0.3.5.1-alpha. diff --git a/changes/bug30744 b/changes/bug30744 deleted file mode 100644 index 9f07d4855..000000000 --- a/changes/bug30744 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (continuous integration): - - Allow the test-stem job to fail in Travis, because it sometimes hangs. - Fixes bug 30744; bugfix on 0.3.5.4-alpha. diff --git a/changes/bug30781 b/changes/bug30781 deleted file mode 100644 index 7c7adf470..000000000 --- a/changes/bug30781 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (directory authorities): - - Stop crashing after parsing an unknown descriptor purpose annotation. - We think this bug can only be triggered by modifying a local file. - Fixes bug 30781; bugfix on 0.2.0.8-alpha. diff --git a/changes/doc30630 b/changes/doc30630 deleted file mode 100644 index 0fbd8d4dd..000000000 --- a/changes/doc30630 +++ /dev/null @@ -1,3 +0,0 @@ - o Documentation: - - Mention URLs for Travis/Appveyor/Jenkins in ReleasingTor.md. Closes - ticket 30630. diff --git a/changes/geoip-2019-06-10 b/changes/geoip-2019-06-10 deleted file mode 100644 index 2d1e06564..000000000 --- a/changes/geoip-2019-06-10 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (geoip): - - Update geoip and geoip6 to the June 10 2019 Maxmind GeoLite2 - Country database. Closes ticket 30852. - diff --git a/changes/ticket30686 b/changes/ticket30686 deleted file mode 100644 index 36473c1a0..000000000 --- a/changes/ticket30686 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features (logging): - - Give a more useful assertion failure message if we think we have - minherit() but we fail to make a region non-inheritable. Give a - compile-time warning if our support for minherit() is - incomplete. Closes ticket 30686.

1 0

[tpo/master] Fix JSON bustage
by gk＠torproject.org 24 Jun '19

24 Jun '19

commit 0a70779d37429f5200c64c459226cb2b8e893cad Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 24 12:53:04 2019 +0000 Fix JSON bustage --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index f97bf7c..cec4405 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -16,7 +16,7 @@ body: "9.0a2", "9.0a2-MacOS", "9.0a2-Linux", -"9.0a2-Windows" +"9.0a2-Windows", "9.0a3", "9.0a3-MacOS", "9.0a3-Linux",

1 0