tor-commits April 2017

tor-commits@lists.torproject.org

19 participants
966 discussions

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 24 Apr '17

24 Apr '17

commit 8f162d6dbd7ebb42e67946b9bdd663c960b6b1f1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 24 07:16:38 2017 +0000 Update translations for torbutton-torbuttondtd --- tr/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/torbutton.dtd b/tr/torbutton.dtd index 8d34ff2..0d860bd 100644 --- a/tr/torbutton.dtd +++ b/tr/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 görüntü ve ses ortamı NoScript aracılığıyla tıklayıp oynat şekline dönüştürülür."> <!ENTITY torbutton.prefs.sec_html5_tooltip "Bazı sitelerde bu ortam nesnelerini etkinleştirebilmek için NoScript düğmesinin kullanılması gerekebilir."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Bazı JavaScript başarım iyileştirmeleri devre dışı bırakılır."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Doğal Düzenli İfade."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Sınır Çizgi JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Bazı sitelerde betikler daha yavaş çalışabilir."> <!ENTITY torbutton.prefs.sec_mathml_desc "Matematik denklemlerini görüntüleyen bazı düzenekler devre dışı bırakılır.">

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 24 Apr '17

24 Apr '17

commit 86e1ade96344b30d20b63c1860ced4d526d2c034 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 24 07:15:18 2017 +0000 Update translations for whisperback_completed --- tr/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index 37391c5..87498f5 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -19,8 +19,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-03-28 21:00+0000\n" -"Last-Translator: T. E. Kalayci <tekrei(a)fsfe.org>\n" +"PO-Revision-Date: 2017-04-24 07:12+0000\n" +"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 24 Apr '17

24 Apr '17

commit b9d96f37cfbd6a81b11c653a3f5261e3927601c3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 24 07:15:14 2017 +0000 Update translations for whisperback --- tr/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index 37391c5..87498f5 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -19,8 +19,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-03-28 21:00+0000\n" -"Last-Translator: T. E. Kalayci <tekrei(a)fsfe.org>\n" +"PO-Revision-Date: 2017-04-24 07:12+0000\n" +"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[tor-browser-build/master] Bug 22025: Fix broken certificate error pages on higher security levels
by boklm＠torproject.org 23 Apr '17

23 Apr '17

commit 899fe6b89d2e5a2bdc46aa50db61c96fbf01927a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 21 06:51:11 2017 +0000 Bug 22025: Fix broken certificate error pages on higher security levels We need to allow JavaScript on `about:certerror` pages explicitly. Otherwise are those pages broken on higher security levels. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 09f3f8e..2ad9731 100644 --- a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 09f3f8e..2ad9731 100644 --- a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 09f3f8e..2ad9731 100644 --- a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false);

1 0

[tor-browser-build/master] Update webrtc, go-webrtc and snowflake
by boklm＠torproject.org 23 Apr '17

23 Apr '17

commit cebffc5e3931f7f921068f44214ff19a0350bf11 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Apr 23 23:29:41 2017 +0200 Update webrtc, go-webrtc and snowflake tor-browser-bundle.git commit: 38689af2a845dfa85765bf52e535c89476863378 tor-browser-bundle.git commit: 121de1ca7cbee29f34f99753a7948c7447e38965 tor-browser-bundle.git commit: e9b16e19134655aa16a8840e09093e01692138d5 --- projects/go-webrtc/config | 6 ++- projects/snowflake/config | 2 +- .../Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- projects/webrtc/build | 58 +++++++++++++--------- projects/webrtc/config | 17 ++++--- projects/webrtc/webrtc-linux.patch | 25 ++++++++++ 6 files changed, 75 insertions(+), 35 deletions(-) diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config index 778d3db..3a1a9d4 100644 --- a/projects/go-webrtc/config +++ b/projects/go-webrtc/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/keroserene/go-webrtc.git -git_hash: 69c5ca70533142494d145b43ef2f46ca94715557 +git_hash: ab1b64862e0c4b4182010699911c2c5818f0a101 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 @@ -23,7 +23,9 @@ var: # the prebuilt libwebrtc-magic.a libraries. Since we build our own # libwebrtc-magic.a with the C++11 ABI, we have to undo that setting here, # using CGO_CXXFLAGS. - export CGO_CXXFLAGS=-D_GLIBCXX_USE_CXX11_ABI=1 + # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. + export CGO_CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1 -D__STDC_FORMAT_MACROS=1" + export CGO_LDFLAGS=-latomic targets: master: diff --git a/projects/snowflake/config b/projects/snowflake/config index 5ba006b..3233ba4 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://git.torproject.org/pluggable-transports/snowflake.git -git_hash: 6cecd31fd896eb26e64ad8bab8a9ea510ec3b21d +git_hash: 9f2e9a6ecb696149708716ca06ce842df03cf492 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index bcf3a19..922e181 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -39,4 +39,4 @@ pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8C pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); -pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 B05EC36590AC0374F0E4D36DDA77908FD59D97F3"); +pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72"); diff --git a/projects/webrtc/build b/projects/webrtc/build index 5a70fbe..3ae7ed0 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -22,20 +22,17 @@ tar -C /var/tmp/build -xf webrtc-sources-[% c('version') %].tar.gz builddir=/var/tmp/build/[% project %]/src cd $builddir -export GYP_CROSSCOMPILE=1 -export GYP_DEFINES="OS=[% c("var/webrtc/os") %] target_arch=[% c("var/webrtc/arch") %]" -# Do not use bundled utilities. -GYP_DEFINES+=" clang=0 host_clang=0 use_sysroot=0" -GYP_DEFINES+=" linux_use_bundled_gold=0 linux_use_gold_flags=0 linux_use_bundled_binutils=0" -# Avoid some dependencies. Some of these don't seem to work fully; for -# example even with use_alsa=0 we need libasound2-dev. -GYP_DEFINES+=" use_x11=0 use_gtk=0 use_gconf=0 use_alsa=0 use_pulseaudio=0 use_libpci=0 include_internal_audio_device=0 enabled_libjingle_device_manager=0" -# examples and tests also bring in dependencies. -GYP_DEFINES+=" include_examples=0 include_tests=0" -# embedded=1 is supposed to turn of various features; see -# https://bugs.chromium.org/p/chromium/issues/detail?id=318413. -GYP_DEFINES+=" embedded=1" -GYP_DEFINES+=" werror=" + +patch -p1 < $rootdir/webrtc-linux.patch + +# First, build a copy of GN, rather than use the prebuilt copy in buildtools/linux64. +cd tools/gn +# __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. +CXXFLAGS=-D__STDC_FORMAT_MACROS=1 LDFLAGS=-latomic ./bootstrap/bootstrap.py --no-rebuild --no-clean +cd ../.. +# This is where bootstrap.py stashes the built gn. +GN="$PWD/out_bootstrap/gn" + [% IF c("var/linux") -%] export CC=gcc export CXX=g++ @@ -48,16 +45,31 @@ GYP_DEFINES+=" werror=" export CXXFLAGS=-m32 export LDFLAGS=-m32 [% END -%] -JAVA_HOME=/usr/lib/jvm/default-java webrtc/build/gyp_webrtc.py -ninja -C out/Release -# Run ninja once more, without include_tests=0, in order to build just the -# FakeAudioCaptureModule that go-webrtc uses. -GYP_DEFINES="$(echo "$GYP_DEFINES" | sed -e 's/include_tests=0//g')" -JAVA_HOME=/usr/lib/jvm/default-java webrtc/build/gyp_webrtc.py -ninja -C out/Release obj/webrtc/api/test/peerconnection_unittests.fakeaudiocapturemodule.o + +export GN_ARGS="" +# For a list of all possible GN args, do "gn gen out/Release; gn args --list out/Release". +# https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/cross… +GN_ARGS+=" target_os=\"linux\" target_cpu=\"[% IF c("var/linux-i686") %]x86[% ELSE %]x64[% END %]\"" +# Not debug. +GN_ARGS+=" is_debug=false" +# There are warnings from unused returns. +GN_ARGS+=" treat_warnings_as_errors=false" +# Build static libraries. +GN_ARGS+=" is_component_build=false" +# Do not use bundled utilities. +GN_ARGS+=" is_clang=false use_sysroot=false" +GN_ARGS+=" gold_path=\"$INSTDIR/binutils/bin\"" +# Make extra sure we don't use bundled binutils. +rm -rf third_party/binutils/Linux_* +# Avoid some dependencies. +GN_ARGS+=" use_ozone=true use_gconf=false" +GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false rtc_include_internal_audio_device=false rtc_include_pulse_audio=false" +# Included for "field_trial" below. Maybe "fieldtrial_testing_like_official_build" could help here? +#GN_ARGS+=" rtc_include_tests=false" +rm -rf out/Release +"$GN" gen out/Release --args="$GN_ARGS" +ninja -C out/Release webrtc field_trial metrics_default pc_test_utils # https://github.com/keroserene/go-webrtc/issues/23#issuecomment-175312648 -# dump_syms_regtest.o is actually an executable, not an object file. If not -# excluded, it results in the error: # libwebrtc-linux-386-magic.a(dump_syms_regtest.o): unsupported ELF file type 2 ar crs libwebrtc-magic.a $(find . -name '*.o' -not -name '*.main.o' -not -name 'dump_syms_regtest.o' | sort) diff --git a/projects/webrtc/config b/projects/webrtc/config index 52618c2..bfd38c9 100644 --- a/projects/webrtc/config +++ b/projects/webrtc/config @@ -4,7 +4,7 @@ remote_docker: 1 filename: 'webrtc-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: - webrtc_tag: f33698296719f956497d2dbff81b5080864a8804 + webrtc_tag: c279861207c5b15fc51069e96595782350e0ac12 input_files: - project: docker-image @@ -17,6 +17,8 @@ input_files: - project: binutils name: binutils enable: '[% c("var/linux") %]' + - filename: webrtc-linux.patch + enable: '[% c("var/linux") %]' targets: linux: @@ -28,16 +30,17 @@ targets: dockerbuild: "[% pc('docker-image', 'pre') %]" sort_deps: 0 arch_deps: - - default-jre-headless - - default-jdk - lib32asound2-dev - lib64expat1 - libexpat1-dev:i386 + - libglib2.0-dev:i386 + - libgtk2.0-dev:i386 - libudev-dev:i386 - libx11-dev:i386 - libxext-dev:i386 - libxrandr-dev:i386 - lib32stdc++6 + - pkg-config - hardening-wrapper webrtc: arch: ia32 @@ -46,14 +49,15 @@ targets: linux-x86_64: var: arch_deps: - - default-jre-headless - - default-jdk - libasound2-dev - libexpat1-dev + - libglib2.0-dev + - libgtk2.0-dev - libudev-dev - libx11-dev - libxext-dev - libxrandr-dev + - pkg-config webrtc: arch: x64 lib_arch: amd64 @@ -70,10 +74,7 @@ steps: # https://webrtc.org/native-code/development/ tar xf [% c('input_files_by_name/depot_tools') %] export PATH="$rootdir/depot_tools:$PATH" - # GYP_CROSSCOMPILE=1 and GYP_DEFINES="use_x11=0" prevent probing for certain dependencies. # Use --no-history because the whole checkout with history is about 12 GB. - export GYP_CROSSCOMPILE=1 - export GYP_DEFINES="use_x11=0" # JAVA_HOME is needed in a hook for libjingle. The readlink line tries to find the current JRE. # default-java comes from the package default-jdk-headless. export JAVA_HOME=/usr/lib/jvm/default-java diff --git a/projects/webrtc/webrtc-linux.patch b/projects/webrtc/webrtc-linux.patch new file mode 100644 index 0000000..b1efb7a --- /dev/null +++ b/projects/webrtc/webrtc-linux.patch @@ -0,0 +1,25 @@ +From ebc1773a92884bec7d93274b2d729ccf76050197 Mon Sep 17 00:00:00 2001 +From: David Fifield <fifield(a)eecs.berkeley.edu> +Date: Wed, 22 Mar 2017 09:53:07 -0400 +Subject: [PATCH] Disable some settings in build_overrides. + +--- + build_overrides/build.gni | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build_overrides/build.gni b/build_overrides/build.gni +index af4924d4c..ffaafdebc 100644 +--- a/build_overrides/build.gni ++++ b/build_overrides/build.gni +@@ -14,7 +14,7 @@ mac_sdk_min_build_override = "10.11" + enable_java_templates = true + + # Some non-Chromium builds don't use Chromium's third_party/binutils. +-linux_use_bundled_binutils_override = true ++linux_use_bundled_binutils_override = false + + # Variable that can be used to support multiple build scenarios, like having + # Chromium specific targets in a client project's GN file etc. +-- +2.12.1 +

1 0

[tor-browser-build/master] Bug 21918: Move meek-amazon to the d2cly7j4zqgua7.cloudfront.net backend.
by boklm＠torproject.org 23 Apr '17

23 Apr '17

commit abfa8f3f04988154da35154924d8b43c04550b92 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 23 17:48:50 2017 -0800 Bug 21918: Move meek-amazon to the d2cly7j4zqgua7.cloudfront.net backend. Still using the same TorLandMeek bridge. --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index 922e181..fea436d 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -36,7 +36,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); /**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); +pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72");

1 0

[tor-browser-build/master] Update ChangeLog
by boklm＠torproject.org 23 Apr '17

23 Apr '17

commit b9fc5fc4a562ea8c5d7fdb797fd3c1ea6f6b413e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Apr 23 23:37:40 2017 +0200 Update ChangeLog --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 291 +++++++++++++++++++++ 1 file changed, 291 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 92b638d..b2ee463 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,294 @@ +Tor Browser 7.0a3 -- April 20 2017 + * All Platforms + * Update Firefox to 52.1.0esr + * Tor to 0.3.0.5-rc + * Update Torbutton to 1.9.7.2 + * Bug 21865: Update our JIT preferences in the security slider + * Bug 21747: Make 'New Tor Circuit for this Site' work in ESR52 + * Bug 21745: Fix handling of catch-all circuit + * Bug 21547: Fix circuit display under e10s + * Bug 21268: e10s compatibility for New Identity + * Bug 21267: Remove window resize implementation for now + * Bug 21201: Make Torbutton multiprocess compatible + * Translations update + * Update Tor Launcher to 0.2.12 + * Bug 21920: Don't show locale selection dialog + * Bug 21546: Mark Tor Launcher as multiprocess compatible + * Bug 21264: Add a README file + * Translations update + * Update HTTPS-Everywhere to 5.2.14 + * Update NoScript to 5.0.2 + * Update sandboxed-tor-browser to 0.0.5 + * Bug 21764: Use bubblewrap's `--die-with-parent` when supported + * Fix e10s Web Content crash on systems with grsec kernels + * Bug 21928: Force a reinstall if an existing hardened bundle is present + * Bug 21929: Remove hardened/ASAN related code + * Bug 21927: Remove the ability to install/update the hardened bundle + * Bug 21244: Update the MAR signing key for 7.0 + * Bug 21536: Remove asn's scramblesuit bridge from Tor Browser + * Add `prlimit64` to the firefox system call whitelist + * Fix compilation with Go 1.8 + * Use Config.Clone() to clone TLS configs when available + * Update Go to 1.7.5 (bug 21709) + * Bug 21555+16450: Don't remove Authorization header on subdomains (e.g. Twitter) + * Bug 21887: Fix broken error pages on higher security levels + * Bug 21876: Enable e10s by default on all supported platforms + * Bug 21876: Always use esr policies for e10s + * Bug 20905: Fix resizing issues after moving to a direct Firefox patch + * Bug 21875: Modal dialogs are maximized in ESR52 nightly builds + * Bug 21885: SVG is not disabled in Tor Browser based on ESR52 + * Bug 17334: Hide Referer when leaving a .onion domain (improved patch) + * Bug 3246: Double-key cookies + * Bug 8842: Fix XML parsing error + * Bug 16886: 16886: "Add-on compatibility check dialog" contains Firefox logo + * Bug 19192: Untrust Blue Coat CA + * Bug 19955: Avoid confusing warning that favicon load request got cancelled + * Bug 20005: Backport fixes for memory leaks investigation + * Bug 20755: ltn.com.tw is broken in Tor Browser + * Bug 21896: Commenting on website is broken due to CAPTCHA not being displayed + * Bug 20680: Rebase Tor Browser patches to 52 ESR + * Bug 21917: Add new obfs4 bridges + * Bug 21918: Move meek-amazon to d2cly7j4zqgua7.cloudfront.net backend + * Windows + * Bug 21795: Fix Tor Browser crashing on github.com + * Bug 12426: Make use of HeapEnableTerminationOnCorruption + * Bug 19316: Make sure our Windows updates can deal with the SSE2 requirement + * Bug 21868: Fix build bustage with FIREFOX_52_0_2esr_RELEASE for Windows + * OS X + * Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID + * Bug 21724: Make Firefox and Tor Browser distinct macOS apps + * Bug 21931: Backport OSX SetupMacCommandLine updater fixes + * Bug 15910: Don't download GMPs via the local fallback + * Linux + * Bug 21907: Fix runtime error on CentOS 6 + * Bug 21748: Fix broken Snowflake build and update bridge details + * Bug 21954: Snowflake breaks the 7.0a3 build + * Bug 15910: Don't download GMPs via the local fallback + * Build system + * Windows + * Bug 21837: Fix reproducibility of accessibility code for Windows + * Bug 21240: Create patches to fix mingw-w64 compilation of Firefox ESR 52 + * Bug 21904: Bump mingw-w64 commit to help with sandbox compilation + * Bug 18831: Use own Yasm for Firefox cross-compilation + * OS X + * Bug 21328: Updating to clang 3.8.0 + * Bug 21754: Remove old GCC toolchain and macOS SDK + * Bug 19783: Remove unused macOS helper scripts + * Bug 10369: Don't use old GCC toolchain anymore for utils + * Bug 21753: Replace our old GCC toolchain in PT descriptor + * Bug 18530: ESR52 based Tor Browser only runs on macOS 10.9+ + * Linux + * Bug 21930: NSS libraries are missing from mar-tools archive + * Bug 21239: Adapt Linux Firefox descriptor to ESR52 (use GTK2) + * Bug 21960: Linux bundles based on ESR 52 are not reproducible anymore + * Bug 21629: Fix broken ASan builds when switching to ESR 52 + +Tor Browser 7.0a2-hardened -- March 7 2017 + * All Platforms + * Update Firefox to 45.8.0esr + * Tor to 0.3.0.4-rc + * OpenSSL to 1.0.2k + * Update Torbutton to 1.9.7.1 + * Bug 21396: Allow leaking of resource/chrome URIs (off by default) + * Bug 21574: Add link for zh manual and create manual links dynamically + * Bug 21330: Non-usable scrollbar appears in tor browser security settings + * Bug 21324: Don't update NoScript button with timer update + * Translation updates + * Update HTTPS-Everywhere to 5.2.11 + * Bug 21514: Restore W^X JIT implementation removed from ESR45 + * Bug 21536: Remove scramblesuit bridge + * Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge + * Bug 21326: Update the "Using a system-installed Tor" section in start script + * Build system + * Bug 17034: Use our built binutils and GCC for building tor + * Code clean-up + +Tor Browser 7.0a2 -- March 7 2017 + * All Platforms + * Update Firefox to 45.8.0esr + * Tor to 0.3.0.4-rc + * OpenSSL to 1.0.2k + * Update Torbutton to 1.9.7.1 + * Bug 21396: Allow leaking of resource/chrome URIs (off by default) + * Bug 21574: Add link for zh manual and create manual links dynamically + * Bug 21330: Non-usable scrollbar appears in tor browser security settings + * Bug 21324: Don't update NoScript button with timer update + * Translation updates + * Update HTTPS-Everywhere to 5.2.11 + * Bug 21514: Restore W^X JIT implementation removed from ESR45 + * Bug 21536: Remove scramblesuit bridge + * Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge + * Bug 21348: Make snowflake only available on Linux for now + * Linux + * Bug 21326: Update the "Using a system-installed Tor" section in start script + * Build system + * OS X + * Bug 21343: Remove unused FTE related parts for macOS + * Linux + * Bug 17034: Use our built binutils and GCC for building tor + * Clean-up + +Tor Browser 6.5.1 -- March 7 2017 + * All Platforms + * Update Firefox to 45.8.0esr + * Tor to 0.2.9.10 + * OpenSSL to 1.0.2k + * Update Torbutton to 1.9.6.14 + * Bug 21396: Allow leaking of resource/chrome URIs (off by default) + * Bug 21574: Add link for zh manual and create manual links dynamically + * Bug 21330: Non-usable scrollbar appears in tor browser security settings + * Translation updates + * Update HTTPS-Everywhere to 5.2.11 + * Bug 21514: Restore W^X JIT implementation removed from ESR45 + * Bug 21536: Remove scramblesuit bridge + * Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge + * Linux + * Bug 21326: Update the "Using a system-installed Tor" section in start script + +Tor Browser 7.0a1-hardened -- January 25 2017 + * All Platforms + * Update Firefox to 45.7.0esr + * Tor to 0.3.0.2-alpha + * Update Torbutton to 1.9.7 + * Bug 19898: Use DuckDuckGo on about:tor + * Bug 21091: Hide the update check menu entry when running under the sandbox + * Bug 21243: Add links to es, fr, and pt Tor Browser manual + * Bug 21194: Show snowflake in the circuit display + * Bug 21131: Remove 2016 donation banner + * Translation updates + * Update HTTPS-Everywhere to 5.2.9 + * Update NoScript to 2.9.5.3 + * Bug 20471: Allow javascript: links from HTTPS first party pages + * Bug 20651: DuckDuckGo does not work with JavaScript disabled + * Bug 20589: Add new MAR signing key + * Bug 20735: Add snowflake pluggable transport to alpha Linux builds + * Build system + * All platforms + * Bug 20927: Upgrade Go to 1.7.4 + +Tor Browser 7.0a1 -- January 25 2017 + * All Platforms + * Update Firefox to 45.7.0esr + * Tor to 0.3.0.2-alpha + * Update Torbutton to 1.9.7 + * Bug 19898: Use DuckDuckGo on about:tor + * Bug 21091: Hide the update check menu entry when running under the sandbox + * Bug 21243: Add links to es, fr, and pt Tor Browser manual + * Bug 21194: Show snowflake in the circuit display + * Bug 21131: Remove 2016 donation banner + * Translation updates + * Update HTTPS-Everywhere to 5.2.9 + * Update NoScript to 2.9.5.3 + * Bug 20471: Allow javascript: links from HTTPS first party pages + * Bug 20651: DuckDuckGo does not work with JavaScript disabled + * Bug 20589: Add new MAR signing key + * Windows + * Bug 20981: On Windows, check TZ for timezone first + * OS X + * Bug 20989: Browser sandbox profile is too restrictive on OSX 10.12.2 + * Linux + * Update sandboxed-tor-browser to 0.0.3 + * Bug 20735: Add snowflake pluggable transport to alpha Linux builds + * Build system + * All platforms + * Bug 20927: Upgrade Go to 1.7.4 + * Linux + * Bug 21103: Update descriptors for sandboxed-tor-browser 0.0.3 + +Tor Browser 6.5 -- January 24 2017 + * All Platforms + * Update Firefox to 45.7.0esr + * Tor to 0.2.9.9 + * OpenSSL to 1.0.2j + * Update Torbutton to 1.9.6.12 + * Bug 16622: Timezone spoofing moved to tor-browser.git + * Bug 17334: Move referrer spoofing for .onion domains into tor-browser.git + * Bug 8725: Block addon resource and url fingerprinting with nsIContentPolicy + * Bug 20701: Allow the directory listing stylesheet in the content policy + * Bug 19837: Whitelist internal URLs that Firefox requires for media + * Bug 19206: Avoid SOCKS auth and NEWNYM collisions when sharing a tor client + * Bug 19273: Improve external app launch handling and associated warnings + * Bug 15852: Remove/synchronize Torbutton SOCKS pref logic + * Bug 19733: GETINFO response parser doesn't handle AF_UNIX entries + IPv6 + * Bug 17767: Make "JavaScript disabled" more visible in Security Slider + * Bug 20556: Use pt-BR strings from now on + * Bug 20614: Add links to Tor Browser User Manual + * Bug 20414: Fix non-rendering arrow on OS X + * Bug 20728: Fix bad preferences.xul dimensions + * Bug 19898: Use DuckDuckGo on about:tor + * Bug 21091: Hide the update check menu entry when running under the sandbox + * Bug 19459: Move resizing code to tor-browser.git + * Bug 20264: Change security slider to 3 options + * Bug 20347: Enhance security slider's custom mode + * Bug 20123: Disable remote jar on all security levels + * Bug 20244: Move privacy checkboxes to about:preferences#privacy + * Bug 17546: Add tooltips to explain our privacy checkboxes + * Bug 17904: Allow security settings dialog to resize + * Bug 18093: Remove 'Restore Defaults' button + * Bug 20373: Prevent redundant dialogs opening + * Bug 20318: Remove helpdesk link from about:tor + * Bug 21243: Add links for pt, es, and fr Tor Browser manuals + * Bug 20753: Remove obsolete StartPage locale strings + * Bug 21131: Remove 2016 donation banner + * Bug 18980: Remove obsolete toolbar button code + * Bug 18238: Remove unused Torbutton code and strings + * Bug 20388+20399+20394: Code clean-up + * Translation updates + * Update Tor Launcher to 0.2.10.3 + * Bug 19568: Set CurProcD for Thunderbird/Instantbird + * Bug 19432: Remove special handling for Instantbird/Thunderbird + * Translation updates + * Update HTTPS-Everywhere to 5.2.9 + * Update NoScript to 2.9.5.3 + * Bug 16622: Spoof timezone with Firefox patch + * Bug 17334: Spoof referrer when leaving a .onion domain + * Bug 19273: Write C++ patch for external app launch handling + * Bug 19459: Size new windows to 1000x1000 or nearest 200x100 (Firefox patch) + * Bug 12523: Mark JIT pages as non-writable + * Bug 20123: Always block remote jar files + * Bug 19193: Reduce timing precision for AudioContext, HTMLMediaElement, and MediaStream + * Bug 19164: Remove support for SHA-1 HPKP pins + * Bug 19186: KeyboardEvents are only rounding to 100ms + * Bug 16998: Isolate preconnect requests to URL bar domain + * Bug 19478: Prevent millisecond resolution leaks in File API + * Bug 20471: Allow javascript: links from HTTPS first party pages + * Bug 20244: Move privacy checkboxes to about:preferences#privacy + * Bug 20707: Fix broken preferences tab in non-en-US alpha bundles + * Bug 20709: Fix wrong update URL in alpha bundles + * Bug 19481: Point the update URL to aus1.torproject.org + * Bug 20556: Start using pt-BR instead of pt-PT for Portuguese + * Bug 20442: Backport fix for local path disclosure after drag and drop + * Bug 20160: Backport fix for broken MP3-playback + * Bug 20043: Isolate SharedWorker script requests to first party + * Bug 18923: Add script to run all Tor Browser regression tests + * Bug 20651: DuckDuckGo does not work with JavaScript disabled + * Bug 19336+19835: Enhance about:tbupdate page + * Bug 20399+15852: Code clean-up + * Windows + * Bug 20981: On Windows, check TZ for timezone first + * Bug 18175: Maximizing window and restarting leads to non-rounded window size + * Bug 13437: Rounded inner window accidentally grows to non-rounded size + * OS X + * Bug 20590: Badly resized window due to security slider notification bar on OS X + * Bug 20439: Make the build PIE on OSX + * Linux + * Bug 20691: Updater breaks if unix domain sockets are used + * Bug 15953: Weird resizing dance on Tor Browser startup + * Build system + * All platforms + * Bug 20927: Upgrade Go to 1.7.4 + * Bug 20583: Make the downloads.json file reproducible + * Bug 20133: Don't apply OpenSSL patch anymore + * Bug 19528: Set MOZ_BUILD_DATE based on Firefox version + * Bug 18291: Remove some uses of libfaketime + * Bug 18845: Make zip and tar helpers generate reproducible archives + * OS X + * Bug 20258: Make OS X Tor archive reproducible again + * Bug 20184: Make OS X builds reproducible (use clang for compiling tor) + * Bug 19856: Make OS X builds reproducible (getting libfaketime back) + * Bug 19410: Fix incremental updates by taking signatures into account + * Bug 20210: In dmg2mar, extract old mar file to copy permissions to the new one + Tor Browser 6.5a6-hardened -- December 14 2016 * All Platforms * Update Firefox to 45.6.0esr

1 0

[metrics-lib/master] Don't skip unrecognized lines in certain cases.
by karsten＠torproject.org 23 Apr '17

23 Apr '17

commit 8f69d784be6830b62bcaa9739e39043e240ebb4c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Apr 7 15:19:44 2017 +0200 Don't skip unrecognized lines in certain cases. When we started using Java 7's switch-on-String in 2b4d773, we broke unrecognized line parsing in extra-info descriptors. Namely, when we reached the end of a crypto block we didn't reset the list for collecting crypto lines. So far so good, but any following unrecognized lines would be collected as crypto lines and later discarded, rather than being added to the unrecognized-lines list and later reported. This only affects relay descriptors, because sanitized bridge descriptors don't contain crypto blocks. And it only affects relay descriptors with crypto blocks, like "identity-ed25519", whereas relay extra-info descriptors published by older versions were not affected. Fixes #21890. --- CHANGELOG.md | 7 +++++++ .../org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java | 4 ++-- .../torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java | 8 ++++++++ .../org/torproject/descriptor/impl/ServerDescriptorImplTest.java | 8 ++++++++ 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b85361..0cb2acd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# Changes in version ??? + + # Medium changes + - Fix a bug where unrecognized lines in extra-info descriptors + below crypto blocks were silently skipped. + + # Changes in version 1.6.0 - 2017-02-17 * Major changes diff --git a/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index d4be77a..136f31e 100644 --- a/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -270,9 +270,9 @@ public abstract class ExtraInfoDescriptorImpl extends DescriptorImpl } this.unrecognizedLines.addAll(cryptoLines); } - cryptoLines = null; - nextCrypto = ""; } + cryptoLines = null; + nextCrypto = ""; break; default: if (cryptoLines != null) { diff --git a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java index 096314e..c29df8c 100644 --- a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java @@ -1805,6 +1805,14 @@ public class ExtraInfoDescriptorImplTest { + ROUTER_SIG_ED25519_LINE); } + @Test(expected = DescriptorParseException.class) + public void testEd25519FollowedbyUnrecognizedLine() + throws DescriptorParseException { + DescriptorBuilder.createWithEd25519Lines(IDENTITY_ED25519_LINES, + MASTER_KEY_ED25519_LINE, ROUTER_SIG_ED25519_LINE + + "\nunrecognized-line 1"); + } + @Test() public void testExtraInfoDigestSha256Relay() throws DescriptorParseException { diff --git a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index 4370321..80dc815 100644 --- a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -1652,6 +1652,14 @@ public class ServerDescriptorImplTest { + ROUTER_SIG_ED25519_LINE); } + @Test(expected = DescriptorParseException.class) + public void testEd25519FollowedbyUnrecognizedLine() + throws DescriptorParseException { + DescriptorBuilder.createWithEd25519Lines(IDENTITY_ED25519_LINES, + MASTER_KEY_ED25519_LINE, ROUTER_SIG_ED25519_LINE + + "\nunrecognized-line 1"); + } + private static final String ONION_KEY_CROSSCERT_LINES = "onion-key-crosscert\n" + "-----BEGIN CROSSCERT-----\n"

1 0

[metrics-web/master] Update news.
by karsten＠torproject.org 23 Apr '17

23 Apr '17

commit 4ba02204f51e68db8ccf77de89a9a0a33c8a8a6f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Apr 23 17:58:38 2017 +0200 Update news. --- website/src/main/resources/etc/news.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/website/src/main/resources/etc/news.json b/website/src/main/resources/etc/news.json index 58d259f..50a56b8 100644 --- a/website/src/main/resources/etc/news.json +++ b/website/src/main/resources/etc/news.json @@ -419,6 +419,17 @@ ] }, { + "start": "2017-04-14", + "protocols": [ + "<OR>" + ], + "description": "Directory authority maatuska's bwscanner stops operating, leading to a drop in traffic on some relays.", + "links": [ + "<a href=\"https://lists.torproject.org/pipermail/tor-consensus-health/2017-April/0078…">tor-consensus-health post</a>", + "<a href=\"https://lists.torproject.org/pipermail/tor-dev/2017-April/012215.html\">tor-dev thread</a>" + ] + }, + { "start": "2016-02-24", "place": "tm", "protocols": [

1 0

[metrics-web/master] Skip bridge network statuses with zero running bridges.
by karsten＠torproject.org 23 Apr '17

23 Apr '17

commit c257f671bd64bacbe15d057be1b83878ad7bf0ce Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Mar 1 16:22:27 2017 +0100 Skip bridge network statuses with zero running bridges. Fixes #21587. --- .../ernie/cron/network/ConsensusStatsFileHandler.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/legacy/src/main/java/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java b/modules/legacy/src/main/java/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java index 9aef3e4..801794f 100644 --- a/modules/legacy/src/main/java/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java +++ b/modules/legacy/src/main/java/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java @@ -257,17 +257,23 @@ public class ConsensusStatsFileHandler { * and bridge authority. */ Map<String, Map<String, int[]>> bridgesPerDayAndAuthority = new HashMap<>(); for (String bridgesRawLine : this.bridgesRaw.values()) { + String[] parts = bridgesRawLine.split(","); + int brunning = Integer.parseInt(parts[2]); + if (brunning <= 0) { + /* Skip this status which contains zero bridges with the Running + * flag. */ + continue; + } String date = bridgesRawLine.substring(0, 10); if (!bridgesPerDayAndAuthority.containsKey(date)) { bridgesPerDayAndAuthority.put(date, new TreeMap<String, int[]>()); } - String[] parts = bridgesRawLine.split(","); String authority = parts[1]; if (!bridgesPerDayAndAuthority.get(date).containsKey(authority)) { bridgesPerDayAndAuthority.get(date).put(authority, new int[3]); } int[] bridges = bridgesPerDayAndAuthority.get(date).get(authority); - bridges[0] += Integer.parseInt(parts[2]); + bridges[0] += brunning; bridges[1] += Integer.parseInt(parts[3]); bridges[2]++; }

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
97
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2017