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

[tor/master] Bump version to 0.3.3.2-alpha-dev
by nickm＠torproject.org 10 Feb '18

10 Feb '18

commit 791ceb202810258ecbe3eafd9c2b8bdfd6a7a4f1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Feb 10 10:41:23 2018 -0500 Bump version to 0.3.3.2-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 87e27da67..1e27dfa56 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.2-alpha]) +AC_INIT([tor],[0.3.3.2-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 e98bea5f7..77e75c450 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.2-alpha" +!define VERSION "0.3.3.2-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 6ff86ffaa..218cc36ec 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.2-alpha" +#define VERSION "0.3.3.2-alpha-dev"

1 0

[tor/master] Increment the release date in the changelog.
by nickm＠torproject.org 10 Feb '18

10 Feb '18

commit efc105716283bbdf44d73422b5036cb3a10c7950 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Feb 10 09:57:36 2018 -0500 Increment the release date in the changelog. "We fray into the future, rarely wrought save in the tapestries of afterthought" -- Richard Wilbur, _Years End_ --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 957d83fac..e572f3d12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.3.3.2-alpha - 2018-02-09 +Changes in version 0.3.3.2-alpha - 2018-02-10 Tor 0.3.3.2-alpha is the second alpha in the 0.3.3.x series. It introduces a mechanism to handle the high loads that many relay operators have been reporting recently. It also fixes several bugs in

1 0

[webwml/master] update alpha version to 0.3.3.2-alpha
by nickm＠torproject.org 10 Feb '18

10 Feb '18

commit a9b3b55fcc512985673e020223fde833bc4aea7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Feb 10 10:05:15 2018 -0500 update alpha version to 0.3.3.2-alpha --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 79d21f99..c307846b 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # website component, and set it to needs_review. export STABLETAG=tor-0.3.2.9 -export DEVTAG=tor-0.3.3.1-alpha +export DEVTAG=tor-0.3.3.2-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate docs/torbutton diff --git a/include/versions.wmi b/include/versions.wmi index 9f1097c3..918a8fe4 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.3.2.9</define-tag> -<define-tag version-alpha whitespace=delete>0.3.3.1-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.3.3.2-alpha</define-tag> <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.5</define-tag>

1 0

[tor-browser-build/master] Bug 23384: Add user mikeperry on build-sunet-a.torproject.net
by boklm＠torproject.org 10 Feb '18

10 Feb '18

commit 468b6c290e3450c2d62c89b06f68cf84e5abd8bc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Feb 10 10:10:54 2018 +0100 Bug 23384: Add user mikeperry on build-sunet-a.torproject.net --- tools/ansible/roles/tbb-team/defaults/main.yml | 1 + tools/ansible/roles/tbb-team/files/mikeperry.pub | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml index cf54157..dd92149 100644 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -4,3 +4,4 @@ tbb_team_members: - brade - gk - mcs + - mikeperry diff --git a/tools/ansible/roles/tbb-team/files/mikeperry.pub b/tools/ansible/roles/tbb-team/files/mikeperry.pub new file mode 100644 index 0000000..277f539 --- /dev/null +++ b/tools/ansible/roles/tbb-team/files/mikeperry.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6R7SmJ88cNencqZTtUmU8cpVpOJCzEklXNIBF4y44ZO2QY9iqJdbC2vuMV68/XUP1G9rz1BOTvyyO3T4/KlvRlHiQEMOy2FObc5znVOAshEqSm450AjGAjpOClV+EpJrvd7LqGIcR6/rLZym7P4aYHkUW/C5DEvyQZUmiCnFSUv8Zh2PFOATP4Veyi0PbJvEPZ73n9QZXDq4mERa1dvwBnGIlXJwKdf3U0Eyx1rZe8OIMY9Rpn+Gq3iuk+1u4SCMiUQGNJ1diG/t40leXlhN3N2cIEBUISpPtwpmTw988UwKneKCXsdi6Dhu2XWoSHpsQrjPDmh9vbpi2yLvlgGv2Q== user@remote

1 0

[tor-messenger-build/master] Add a patch for tor-launcher skin chrome:// uris
by arlo＠torproject.org 10 Feb '18

10 Feb '18

commit 581ba7d2f5f9c22d9c9182a45c12bcf8c1f57e6e Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Feb 9 17:14:05 2018 -0500 Add a patch for tor-launcher skin chrome:// uris It is unclear why this is necessary. --- .../0001-Workaround-for-chrome-uri-skin-path.patch | 35 ++++++++++++++++++++++ projects/tor-launcher/build | 1 + projects/tor-launcher/config | 1 + 3 files changed, 37 insertions(+) diff --git a/projects/tor-launcher/0001-Workaround-for-chrome-uri-skin-path.patch b/projects/tor-launcher/0001-Workaround-for-chrome-uri-skin-path.patch new file mode 100644 index 0000000..fc3f80a --- /dev/null +++ b/projects/tor-launcher/0001-Workaround-for-chrome-uri-skin-path.patch @@ -0,0 +1,35 @@ +From 6bb9cd2f4993d4a863d55da06e2e781d4003fd33 Mon Sep 17 00:00:00 2001 +From: Arlo Breault <arlolra(a)gmail.com> +Date: Fri, 9 Feb 2018 17:10:50 -0500 +Subject: [PATCH] Workaround for chrome:// uri skin path + +--- + chrome.manifest.in | 2 ++ + src/chrome/content/network-settings.css | 1 + + 2 files changed, 3 insertions(+) + create mode 120000 src/chrome/content/network-settings.css + +diff --git a/chrome.manifest.in b/chrome.manifest.in +index a869569..829d1c8 100644 +--- a/chrome.manifest.in ++++ b/chrome.manifest.in +@@ -5,6 +5,8 @@ content torlauncher chrome/content/ + + skin torlauncher classic/1.0 chrome/skin/ + ++override chrome://torlauncher/skin/network-settings.css chrome://torlauncher/content/network-settings.css ++ + resource torlauncher ./ + + # Firefox 4-style component registration +diff --git a/src/chrome/content/network-settings.css b/src/chrome/content/network-settings.css +new file mode 120000 +index 0000000..f694612 +--- /dev/null ++++ b/src/chrome/content/network-settings.css +@@ -0,0 +1 @@ ++../skin/network-settings.css +\ No newline at end of file +-- +2.16.1 + diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index f9cf764..fc32c5d 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -2,6 +2,7 @@ [% c("var/set_default_env") -%] tar xvf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] +patch -p1 < ../0001-Workaround-for-chrome-uri-skin-path.patch [% IF c("var/tor_control_port") -%] patch -p1 < ../controlport.patch [% END -%] diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 67a31b3..38874b3 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -14,4 +14,5 @@ input_files: refresh_input: 1 enable: '[% c("var/tor_control_port") %]' - filename: tm-logo.svg + - filename: 0001-Workaround-for-chrome-uri-skin-path.patch - project: container-image

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 10 Feb '18

10 Feb '18

commit 1db949aaa22613b12f307ecbad37c3e8025e1a2d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 10 00:47:26 2018 +0000 Update translations for abouttor-homepage_completed --- nb/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nb/aboutTor.dtd b/nb/aboutTor.dtd index 0e48ee575..038d29385 100644 --- a/nb/aboutTor.dtd +++ b/nb/aboutTor.dtd @@ -14,7 +14,7 @@ <!ENTITY aboutTor.success.label "Velkommen til Tor-nettleseren"> <!ENTITY aboutTor.success2.label "Tilkoblet Tor-nettverket."> -<!ENTITY aboutTor.success3.label "Nå kan du surfe anonymt på internett."> +<!ENTITY aboutTor.success3.label "Nå kan du surfe anonymt på Internett."> <!ENTITY aboutTor.failure.label "Noe gikk galt!"> <!ENTITY aboutTor.failure2.label "Tor fungerer ikke i denne nettleseren.">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 10 Feb '18

10 Feb '18

commit 8f8db92304fc700364067dee665f8fe6942a5df2 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 10 00:47:21 2018 +0000 Update translations for abouttor-homepage --- nb/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nb/aboutTor.dtd b/nb/aboutTor.dtd index 0e48ee575..038d29385 100644 --- a/nb/aboutTor.dtd +++ b/nb/aboutTor.dtd @@ -14,7 +14,7 @@ <!ENTITY aboutTor.success.label "Velkommen til Tor-nettleseren"> <!ENTITY aboutTor.success2.label "Tilkoblet Tor-nettverket."> -<!ENTITY aboutTor.success3.label "Nå kan du surfe anonymt på internett."> +<!ENTITY aboutTor.success3.label "Nå kan du surfe anonymt på Internett."> <!ENTITY aboutTor.failure.label "Noe gikk galt!"> <!ENTITY aboutTor.failure2.label "Tor fungerer ikke i denne nettleseren.">

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 10 Feb '18

10 Feb '18

commit bc901ccb775ae1d1205e9fe0189ba44a62a22e94 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 10 00:47:05 2018 +0000 Update translations for tor-launcher-network-settings_completed --- nb/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nb/network-settings.dtd b/nb/network-settings.dtd index 24649f957..b59c6606f 100644 --- a/nb/network-settings.dtd +++ b/nb/network-settings.dtd @@ -45,7 +45,7 @@ <!ENTITY torsettings.useBridges.label "Skriv inn broinformasjon fra en betrodd kilde."> <!ENTITY torsettings.useBridges.placeholder "type addresse:port (én per linje)"> -<!ENTITY torsettings.copyLog "Kopier Torloggen til Utklippstavlen"> +<!ENTITY torsettings.copyLog "Kopier Tor-loggen til utklippstavlen"> <!ENTITY torsettings.proxyHelpTitle "Mellomtjenerhjelp"> <!ENTITY torsettings.proxyHelp1 "En lokal mellomtjener trengs når du kobler til fra et bedrifts-, skole-, eller universitets-nettverk. Hvis du ikke er sikker på hvordan du besvarer dette spørsmålet, sjekk internettinnstillingene i en annen nettleser, eller sjekk nettverksinnstillingene på systemet ditt for å se hvorvidt en mellomtjener behøves.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 10 Feb '18

10 Feb '18

commit eb87d873a82e2665643c292d97fd07a2dc2d299a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 10 00:46:59 2018 +0000 Update translations for tor-launcher-network-settings --- nb/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nb/network-settings.dtd b/nb/network-settings.dtd index 24649f957..b59c6606f 100644 --- a/nb/network-settings.dtd +++ b/nb/network-settings.dtd @@ -45,7 +45,7 @@ <!ENTITY torsettings.useBridges.label "Skriv inn broinformasjon fra en betrodd kilde."> <!ENTITY torsettings.useBridges.placeholder "type addresse:port (én per linje)"> -<!ENTITY torsettings.copyLog "Kopier Torloggen til Utklippstavlen"> +<!ENTITY torsettings.copyLog "Kopier Tor-loggen til utklippstavlen"> <!ENTITY torsettings.proxyHelpTitle "Mellomtjenerhjelp"> <!ENTITY torsettings.proxyHelp1 "En lokal mellomtjener trengs når du kobler til fra et bedrifts-, skole-, eller universitets-nettverk. Hvis du ikke er sikker på hvordan du besvarer dette spørsmålet, sjekk internettinnstillingene i en annen nettleser, eller sjekk nettverksinnstillingene på systemet ditt for å se hvorvidt en mellomtjener behøves.">

1 0

[atlas/master] Only show version from consensus if inconsistent with platform (Fixes: #24974)
by irl＠torproject.org 10 Feb '18

10 Feb '18

commit b186e90e81f158b222d5df4e91956420db83c8b0 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sat Feb 10 00:29:56 2018 +0000 Only show version from consensus if inconsistent with platform (Fixes: #24974) --- js/models/relay.js | 4 +++- templates/details/router.html | 7 ++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/js/models/relay.js b/js/models/relay.js index 4984d65..cd3078b 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -233,9 +233,11 @@ define([ model.set({badexit: false}); relay.flags = model.parseflags(relay.flags, relay.is_bridge); + relay.version_consistent = relay.version == relay.platform.split(" ")[1]; + /* Synthetic Additional Flags */ var additional_flags = [] - if (!((typeof relay.recommended_version !== 'undefined') ? relay.recommended_version : true)) additional_flags.push("Not Recommended"); + if (!((typeof relay.recommended_version !== 'undefined') ? relay.recommended_version : false) && relay.version_consistent) additional_flags.push("Not Recommended"); if (!((typeof relay.measured !== 'undefined') ? relay.measured : true)) additional_flags.push("Unmeasured"); if (((typeof relay.hibernating !== 'undefined') ? relay.hibernating : false)) additional_flags.push("Hibernating"); if (IsFallbackDir(relay.fingerprint)) additional_flags.push("FallbackDir"); diff --git a/templates/details/router.html b/templates/details/router.html index 4842987..5233648 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -10,7 +10,7 @@ <% if (relay.get('new_relay') === true) {%> <div class="alert alert-info">This relay appears to be less than 2 weeks old. <a href="https://blog.torproject.org/lifecycle-new-relay">This blog post</a> explains the lifecycle of a new relay, and why it will not be immediately fully used to capacity.</div> <% } %> -<% if (relay.get('recommended_version') === false) { %> +<% if (relay.get('recommended_version') === false && relay.get('version_consistent') == true) { %> <div class="alert alert-danger">This relay is running an outdated Tor version and should be updated to a recent release of Tor that may contain important fixes.</div> <% } %> <div class="row"> @@ -164,10 +164,7 @@ <dd><%= relay.get('consensus_weight') %></dd> <dt><span class="tip" title="What OS and Tor version the relay is using">Platform</span></dt> - <dd><%= _.escape(relay.get('platform')) %></dd> - - <dt><span class="tip" title="Tor version as seen in the consensus (used to determine whether or not this relay runs a recommended version of tor)">Version</span></dt> - <dd><%= _.escape(relay.get('version')) %></dd> + <dd><%= _.escape(relay.get('platform')) %><% if (!relay.get('version_consistent')) { %> (version is <%= _.escape(relay.get('version')) %> in consensus)<% } %></dd> </dl> </div>

1 0