January 2015 - tbb-commits - lists.torproject.org

[tor-launcher/master] Bump versions to 0.2.7.0.2 (translation updates only).
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit ae0cd6684b460f2602ac096814dc503116a4ed86 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 9 22:15:02 2015 +0000 Bump versions to 0.2.7.0.2 (translation updates only). --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 7c4ebf6..b78c677 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.7.0.1</em:version> + <em:version>0.2.7.0.2</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[tor-browser-bundle/maint-4.0] Bug #13776: Incremental MAR files not reproducible
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit 1fa248e28610b14a41228cd0533a8fb147c0b928 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Dec 12 11:54:40 2014 -0500 Bug #13776: Incremental MAR files not reproducible Set the locale and umask to avoid differences across systems and users when generating incremental MAR files. --- tools/update-responses/update_responses | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index c788586..b28b575 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -10,9 +10,16 @@ use Cwd; use File::Temp; use File::Find; use File::Which; +use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; +# Set umask and locale to provide a consistent environment for MAR file +# generation, etc. +umask(0022); +$ENV{"LC_ALL"} = "C"; +setlocale(LC_ALL, "C"); + my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); my %htdocsfiles = ( '.' => 1, '..' => 1, 'no-update.xml' => 1 );

1 0

[tor-browser-bundle/master] Bug 13857: allow making incrementals MARs for a specific channel
by gk＠torproject.org 08 Jan '15

08 Jan '15

commit 0f37c120647be48614d3af9512bcc06ba295fa34 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 8 14:43:12 2014 +0100 Bug 13857: allow making incrementals MARs for a specific channel The gen_incrementals can now receive a channel name as argument. In that case, incremental MARs will be created for this channel only. If there is no argument, incremental MARs for all channels are created. Makefile rules have been added for the different channels. --- gitian/Makefile | 8 +++++++- gitian/README.build | 4 ++++ tools/update-responses/update_responses | 24 +++++++++++++++--------- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 9613db6..1fce05e 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -33,7 +33,13 @@ build-beta: ./hash-bundles.sh versions.beta incrementals: - ../tools/update-responses/gen_incrementals + ../tools/update-responses/gen_incrementals release + +incrementals-alpha: + ../tools/update-responses/gen_incrementals alpha + +incrementals-beta: + ../tools/update-responses/gen_incrementals beta signmars: ./signmars.sh versions diff --git a/gitian/README.build b/gitian/README.build index 670e84c..dd7af91 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -78,6 +78,10 @@ Detailed Explanation of Scripts: - hash-nightly: The equivalent to the 'hash' rule for nightly packages - hash-alpha: The equivalent to the 'hash' rule for alpha packages - hash-beta: The equivalent to the 'hash' rule for beta packages + - incrementals-alpha: The equivalent to the 'incrementals' rule for + alpha packages + - incrementals-beta: The equivalent to the 'incrementals' rule for + beta packages - signmars-nightly: The equivalent to the 'signmars' rule for nightly packages - signmars-alpha: The equivalent to the 'signmars' rule for alpha packages - signmars-beta: The equivalent to the 'signmars' rule for beta packages diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 5b85037..e66b27d 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -180,14 +180,6 @@ sub create_missing_incremental_mars_for_version { $pm->wait_all_children; } -sub create_all_missing_incremental_mars { - my ($config) = @_; - foreach my $version (values %{$config->{channels}}) { - get_version_files($config, $version); - create_missing_incremental_mars_for_version($config, $version); - } -} - sub get_config { my ($config, $version, $os, $name) = @_; return $config->{versions}{$version}{$os}{$name} @@ -195,6 +187,16 @@ sub get_config { // $config->{$name}; } +sub channel_to_version { + my ($config, @channels) = @_; + return values %{$config->{channels}} unless @channels; + foreach my $channel (@channels) { + exit_error "Unknown channel $channel" + unless $config->{channels}{$channel}; + } + return map { $config->{channels}{$_} } @channels; +} + sub get_response { my ($config, $version, $os, @patches) = @_; my $res; @@ -325,9 +327,13 @@ my %actions = ( clean_htdocs; }, gen_incrementals => sub { + my ($config) = @_; extract_martools; check_deps; - create_all_missing_incremental_mars(@_); + foreach my $version (channel_to_version($config, @ARGV)) { + get_version_files($config, $version); + create_missing_incremental_mars_for_version($config, $version); + } }, );

1 0

[tor-browser-bundle/master] Bug 13857: allow updating responses for a specific channel
by gk＠torproject.org 08 Jan '15

08 Jan '15

commit 808746222a49af4e6294dc82397932e331d2a4fd Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 8 19:19:19 2014 +0100 Bug 13857: allow updating responses for a specific channel The update_responses command can now receive a channel name as argument. In that case, only the xml responses for the selected channel(s) are updated. The files are now located in directory htdocfiles/$channel and each channel has its own .htaccess file in that directory. Makefile rules have been added to update the different channels. --- gitian/Makefile | 8 +++- gitian/README.build | 4 ++ tools/update-responses/htdocs/no-update.xml | 2 - tools/update-responses/update_responses | 66 ++++++++++++++++----------- 4 files changed, 51 insertions(+), 29 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 1fce05e..eaa22c2 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -54,7 +54,13 @@ signmars-nightly: ./signmars.sh versions.nightly update_responses: - ../tools/update-responses/update_responses + ../tools/update-responses/update_responses release + +update_responses-alpha: + ../tools/update-responses/update_responses alpha + +update_responses-beta: + ../tools/update-responses/update_responses beta hash: ./hash-bundles.sh versions diff --git a/gitian/README.build b/gitian/README.build index dd7af91..b51fd96 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -82,6 +82,10 @@ Detailed Explanation of Scripts: alpha packages - incrementals-beta: The equivalent to the 'incrementals' rule for beta packages + - update_responses-alpha: The equivalent to the 'update_responses' rule + for alpha packages + - update_responses-beta: The equivalent to the 'update_responses' rule + for beta packages - signmars-nightly: The equivalent to the 'signmars' rule for nightly packages - signmars-alpha: The equivalent to the 'signmars' rule for alpha packages - signmars-beta: The equivalent to the 'signmars' rule for beta packages diff --git a/tools/update-responses/htdocs/no-update.xml b/tools/update-responses/htdocs/no-update.xml deleted file mode 100644 index 910e99d..0000000 --- a/tools/update-responses/htdocs/no-update.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates></updates> diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index e66b27d..0c487e3 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -24,7 +24,7 @@ setlocale(LC_ALL, "C"); my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); -my %htdocsfiles = ( '.' => 1, '..' => 1, 'no-update.xml' => 1 ); +my %htdocsfiles; my $releases_dir = "$FindBin::Bin/../../gitian"; sub exit_error { @@ -46,17 +46,21 @@ sub get_nbprocs { } sub write_htdocs { - my ($file, $content) = @_; + my ($channel, $file, $content) = @_; mkdir $htdocsdir unless -d $htdocsdir; - write_file("$htdocsdir/$file", $content); - $htdocsfiles{$file} = 1; + mkdir "$htdocsdir/$channel" unless -d "$htdocsdir/$channel"; + write_file("$htdocsdir/$channel/$file", $content); + $htdocsfiles{$channel}->{$file} = 1; } sub clean_htdocs { - opendir(my $d, $htdocsdir); - my @files = grep { ! $htdocsfiles{$_} } readdir $d; - closedir $d; - unlink map { "$htdocsdir/$_" } @files; + my (@channels) = @_; + foreach my $channel (@channels) { + opendir(my $d, "$htdocsdir/$channel"); + my @files = grep { ! $htdocsfiles{$channel}->{$_} } readdir $d; + closedir $d; + unlink map { "$htdocsdir/$channel/$_" } @files; + } } sub get_sha512_hex_of_file { @@ -233,8 +237,10 @@ sub get_response { } sub write_responses { - my ($config) = @_; - foreach my $version (values %{$config->{channels}}) { + my ($config, @channels) = @_; + @channels = keys %{$config->{channels}} unless @channels; + foreach my $channel (@channels) { + my $version = $config->{channels}{$channel}; get_version_files($config, $version); my $files = $config->{versions}{$version}{files}; my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; @@ -249,43 +255,44 @@ sub write_responses { foreach my $lang (keys %{$files->{$os}}) { my $resp = get_response($config, $version, $os, $files->{$os}{$lang}{complete}); - write_htdocs("$version-$os-$lang.xml", $resp); + write_htdocs($channel, "$version-$os-$lang.xml", $resp); foreach my $from_version (keys %{$files->{$os}{$lang}{partial}}) { $resp = get_response($config, $version, $os, $files->{$os}{$lang}{complete}, $files->{$os}{$lang}{partial}{$from_version}); - write_htdocs("$from_version-$version-$os-$lang.xml", $resp); + write_htdocs($channel, "$from_version-$version-$os-$lang.xml", $resp); } } } + write_htdocs($channel, 'no-update.xml', + '<?xml version="1.0" encoding="UTF-8"?>' + . "\n<updates></updates>\n"); } } sub write_htaccess { - my ($config) = @_; - my $htaccess = "RewriteEngine On\n"; + my ($config, @channels) = @_; + @channels = keys %{$config->{channels}} unless @channels; my $flags = "[last]"; - foreach my $channel (sort keys %{$config->{channels}}) { + foreach my $channel (@channels) { + my $htaccess = "RewriteEngine On\n"; my $version = $config->{channels}{$channel}; my $files = $config->{versions}{$version}{files}; - $htaccess .= "RewriteRule " - . "^$channel/[^\/]+/$version/ " - . "no-update.xml $flags\n"; + $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; foreach my $os (sort keys %$files) { my $bt = build_target_by_os($os); foreach my $lang (sort keys %{$files->{$os}}) { foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { - $htaccess .= "RewriteRule ^$channel/$bt/$from_version/$lang " + $htaccess .= "RewriteRule ^$bt/$from_version/$lang " . "$from_version-$version-$os-$lang.xml $flags\n"; } - $htaccess .= "RewriteRule ^$channel/$bt/[^\/]+/$lang " + $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " . "$version-$os-$lang.xml $flags\n"; } - $htaccess .= "RewriteRule ^$channel/$bt " - . "$version-$os-en-US.xml $flags\n"; + $htaccess .= "RewriteRule ^$bt $version-$os-en-US.xml $flags\n"; } + write_htdocs($channel, '.htaccess', $htaccess); } - write_htdocs('.htaccess', $htaccess); } sub check_deps { @@ -322,9 +329,16 @@ sub extract_martools { my %actions = ( update_responses => sub { - write_responses(@_); - write_htaccess(@_); - clean_htdocs; + my ($config) = @_; + my @channels = @ARGV ? @ARGV : keys %{$config->{channels}}; + foreach my $channel (@channels) { + exit_error "Unknown channel $channel" + unless $config->{channels}{$channel}; + $htdocsfiles{$channel} = { '.' => 1, '..' => 1 }; + } + write_responses($config, @channels); + write_htaccess($config, @channels); + clean_htdocs(@channels); }, gen_incrementals => sub { my ($config) = @_;

1 0

[tor-browser-bundle/master] Add a command to check an update_responses deployement
by gk＠torproject.org 08 Jan '15

08 Jan '15

commit ca6ca42b8a78f5dd6b0cad7db0f8416e3a419332 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 22 14:55:20 2014 +0100 Add a command to check an update_responses deployement usage: check_update_responses_deployement <base_url> [channels...] example: $ ./check_update_responses_deployement \ https://dist.torproject.org/torbrowser/update_2 release This command will read the config.yml file, then try to load different URLs to check that it returns correct xml with the expected version, incremental update files for the versions that should have them, or no update when already using the current version. It does not currently check that the checksum of the files is correct. --- tools/update-responses/README.md | 8 +- .../check_update_responses_deployement | 1 + tools/update-responses/update_responses | 106 ++++++++++++++++++++ 3 files changed, 112 insertions(+), 3 deletions(-) diff --git a/tools/update-responses/README.md b/tools/update-responses/README.md index 206bd7a..5fe69a2 100644 --- a/tools/update-responses/README.md +++ b/tools/update-responses/README.md @@ -13,7 +13,8 @@ Dependencies The following perl modules need to be installed to run the script: FindBin YAML File::Slurp Digest::SHA XML::Writer File::Temp - IO::CaptureOutput File::Which Parallel::ForkManager + IO::CaptureOutput File::Which Parallel::ForkManager XML::LibXML + LWP On Debian / Ubuntu you can install them with: @@ -21,7 +22,8 @@ On Debian / Ubuntu you can install them with: # apt-get install libfindbin-libs-perl libyaml-perl libfile-slurp-perl \ libdigest-sha-perl libxml-writer-perl \ libio-captureoutput-perl libfile-which-perl \ - libparallel-forkmanager-perl + libparallel-forkmanager-perl libxml-libxml-perl \ + libwww-perl ``` On Red Hat / Fedora you can install them with: @@ -29,7 +31,7 @@ On Red Hat / Fedora you can install them with: ``` # for module in FindBin YAML File::Slurp Digest::SHA XML::Writer \ File::Temp IO::CaptureOutput File::Which \ - Parallel::ForkManager + Parallel::ForkManager XML::LibXML LWP do yum install "perl($module)"; done ``` diff --git a/tools/update-responses/check_update_responses_deployement b/tools/update-responses/check_update_responses_deployement new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/check_update_responses_deployement @@ -0,0 +1 @@ +update_responses \ No newline at end of file diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 0c487e3..f982637 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -1,6 +1,7 @@ #!/usr/bin/perl -w use strict; +use feature "state"; use English; use FindBin; use YAML qw(LoadFile); @@ -15,6 +16,8 @@ use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; use File::Basename; +use XML::LibXML '1.70'; +use LWP::Simple; # Set umask and locale to provide a consistent environment for MAR file # generation, etc. @@ -26,6 +29,7 @@ my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); my %htdocsfiles; my $releases_dir = "$FindBin::Bin/../../gitian"; +my @check_errors; sub exit_error { print STDERR "Error: ", $_[0], "\n"; @@ -327,6 +331,107 @@ sub extract_martools { $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; } +sub log_step { + my ($url, $step, $status, $details) = @_; + state $u; + if (!defined $u || $url ne $u) { + print "\n" if $u; + print "$url\n"; + $u = $url; + } + print ' ', $step, $status ? ': OK' : ': ERROR', + $details ? " - $details\n" : "\n"; + return if $status; + push @check_errors, { url => $url, step => $step, details => $details }; +} + +sub get_remote_xml { + my ($url) = @_; + my $content = get $url; + log_step($url, 'get', defined $content); + return undef unless defined $content; + my $dom = eval { XML::LibXML->load_xml(string => $content) }; + log_step($url, 'parse_xml', defined $dom, $@); + return $dom; +} + +sub check_get_version { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return undef unless @updates; + return $updates[0]->getAttribute('appVersion'); +} + +sub check_no_update { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return @updates == 0; +} + +sub check_has_incremental { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return undef unless @updates; + my @patches = $updates[0]->getChildrenByLocalName('patch'); + foreach my $patch (@patches) { + return 1 if $patch->getAttribute('type') eq 'partial'; + } + return undef; +} + +sub check_update_responses_channel { + my ($config, $base_url, $channel) = @_; + my $channel_version = $config->{channels}{$channel}; + foreach my $build_target (values %{$config->{build_targets}}) { + foreach my $lang (qw(en-US de)) { + my $url = "$base_url/$channel/$build_target/1.0/$lang"; + my $dom = get_remote_xml($url); + if ($dom) { + my $version = check_get_version($dom); + log_step($url, 'version', $version eq $channel_version, + "expected: $channel_version received: $version"); + } + $url = "$base_url/$channel/$build_target/$channel_version/$lang"; + $dom = get_remote_xml($url); + log_step($url, 'no_update', check_no_update($dom)) if $dom; + my @inc = @{$config->{versions}{$channel_version}{incremental_from}} + if $config->{versions}{$channel_version}{incremental_from}; + foreach my $inc_from (@inc) { + my $url = "$base_url/$channel/$build_target/$inc_from/$lang"; + $dom = get_remote_xml($url); + next unless $dom; + my $version = check_get_version($dom); + log_step($url, 'version', $version eq $channel_version, + "expected: $channel_version received: $version"); + log_step($url, 'has_incremental', check_has_incremental($dom)); + } + } + } +} + +sub check_update_responses { + my ($config) = @_; + exit_error "usage: $PROGRAM_NAME <base_url> [channels...]" unless @ARGV; + my ($base_url, @channels) = @ARGV; + foreach my $channel (@channels ? @channels : keys %{$config->{channels}}) { + check_update_responses_channel($config, $base_url, $channel); + } + if (!@check_errors) { + print "\n\nNo errors\n"; + return; + } + print "\n\nErrors list:\n"; + my $url = ''; + foreach my $error (@check_errors) { + if ($url ne $error->{url}) { + $url = $error->{url}; + print "$url\n"; + } + print " $error->{step}", + $error->{details} ? " - $error->{details}\n" : "\n"; + } +} + my %actions = ( update_responses => sub { my ($config) = @_; @@ -349,6 +454,7 @@ my %actions = ( create_missing_incremental_mars_for_version($config, $version); } }, + check_update_responses_deployement => \&check_update_responses, ); my $action = fileparse($PROGRAM_NAME);

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'boklm/bug13857-v2'
by gk＠torproject.org 08 Jan '15

08 Jan '15

commit 5401e06508eae0aaa8f6357303b006dd833ba8e5 Merge: bf363a7 ca6ca42 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 8 14:28:00 2015 +0000 Merge remote-tracking branch 'boklm/bug13857-v2' gitian/Makefile | 16 +- gitian/README.build | 8 + tools/update-responses/README.md | 8 +- .../check_update_responses_deployement | 1 + tools/update-responses/htdocs/no-update.xml | 2 - tools/update-responses/update_responses | 196 ++++++++++++++++---- 6 files changed, 189 insertions(+), 42 deletions(-)

1 0

[torbutton/master] Bug 13835: Add support for TOR_DEFAULT_HOMEPAGE env variable.
by brade＠torproject.org 07 Jan '15

07 Jan '15

commit a8b1333f08cd79699bec0d3d9a74845487c9a8be Author: linostar <linux.anas(a)gmail.com> Date: Tue Jan 6 17:33:39 2015 +0200 Bug 13835: Add support for TOR_DEFAULT_HOMEPAGE env variable. If TOR_DEFAULT_HOMEPAGE is set and the user has not customized the browser home page, it is reset to the value contained in TOR_DEFAULT_HOMEPAGE. --- src/components/startup-observer.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js index d7b7bcd..de39e64 100644 --- a/src/components/startup-observer.js +++ b/src/components/startup-observer.js @@ -38,6 +38,16 @@ function StartupObserver() { getService(Ci.nsIObserverService); observerService.addObserver(this, "quit-application-granted", false); + var env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); + var prefName = "browser.startup.homepage"; + if (env.exists("TOR_DEFAULT_HOMEPAGE")) { + // if the user has set this value in a previous installation, don't override it + if (!this._prefs.prefHasUserValue(prefName)) { + this._prefs.setCharPref(prefName, env.get("TOR_DEFAULT_HOMEPAGE")); + } + } + try { var test = this._prefs.getCharPref("torbrowser.version"); this.is_tbb = true;

1 0

[tor-browser-bundle/master] Update a comment.
by gk＠torproject.org 06 Jan '15

06 Jan '15

commit bf363a746eeb3a5e7243f573a5ffeda93a31aa9f Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 5 18:12:28 2015 -0800 Update a comment. The meek-http-helper profile now has a proxy set even if it somehow starts up without extensions. --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index eb94d1d..72bbb9b 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -10,7 +10,7 @@ user_pref("browser.dom.window.dump.enabled", true); user_pref("security.ssl.disable_session_identifiers", false); // Disable safe mode. In case of a crash, we don't want to prompt for a -// safe-mode browser that has extensions disabled and no proxy. +// safe-mode browser that has extensions disabled. // https://support.mozilla.org/en-US/questions/951221#answer-410562 user_pref("toolkit.startup.max_resumed_crashes", -1);

1 0

[tor-browser-bundle/maint-4.0] Update a comment.
by gk＠torproject.org 06 Jan '15

06 Jan '15

commit 8df1fb275aa6427f4af9c683e06d4ad4c0c07727 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 5 18:12:28 2015 -0800 Update a comment. The meek-http-helper profile now has a proxy set even if it somehow starts up without extensions. --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index eb94d1d..72bbb9b 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -10,7 +10,7 @@ user_pref("browser.dom.window.dump.enabled", true); user_pref("security.ssl.disable_session_identifiers", false); // Disable safe mode. In case of a crash, we don't want to prompt for a -// safe-mode browser that has extensions disabled and no proxy. +// safe-mode browser that has extensions disabled. // https://support.mozilla.org/en-US/questions/951221#answer-410562 user_pref("toolkit.startup.max_resumed_crashes", -1);

1 0

[tor-browser-bundle/maint-4.0] Upgrade meek to 0.15.
by gk＠torproject.org 05 Jan '15

05 Jan '15

commit f256d6c751a7c51dfa511dcf18babe1b3f792577 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 27 17:24:15 2014 +0000 Upgrade meek to 0.15. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index 6f9d97b..a8c9475 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index e17b071..b970b51 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7 diff --git a/gitian/versions.beta b/gitian/versions.beta index 29ba9e9..8aa5ea1 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 GITIAN_TAG=tor-browser-builder-3.x-6

1 0