date:20180221

[tor-commits] [tor-browser-build/master] s/developement/development/

2018-02-21 Thread gk

commit f7c8e84c93792e006b4357343313c6989499f2ec
Author: Georg Koppen 
Date:   Thu Feb 22 07:31:33 2018 +

s/developement/development/

Thanks to arma for catching this.
---
 rbm.local.conf.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rbm.local.conf.example b/rbm.local.conf.example
index 916cb5e..dc3f038 100644
--- a/rbm.local.conf.example
+++ b/rbm.local.conf.example
@@ -100,7 +100,7 @@ targets:
 
 ### By default 'fetch' is set to 1 for nightly builds, meaning that new
 ### commits will be fetched automatically during each build. You can
-### disable this during developement if you want to do rebuilds to test
+### disable this during development if you want to do rebuilds to test
 ### a specific change, but don't want rebuilds caused by unrelated
 ### changes, or if you want to decide at which point new commits are
 ### fetched. When 'fetch' is set to 'if_needed', new commits will only

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-build/master] It's "its" and not "it's" (for all "it's")

2018-02-21 Thread gk

commit fa29c1922c1e27ff94663ef1380b81b8f9c46206
Author: Georg Koppen 
Date:   Thu Feb 22 07:27:30 2018 +

It's "its" and not "it's" (for all "it's")

Thanks to arma for catching this.
---
 .../Data/Browser/profile.default/preferences/extension-overrides.js| 3 ++-
 .../Data/Browser/profile.default/preferences/extension-overrides.js| 3 ++-
 .../Data/Browser/profile.default/preferences/extension-overrides.js| 3 ++-
 3 files changed, 6 insertions(+), 3 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 9476edc..c81a7bf 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
@@ -58,5 +58,6 @@ pref("noscript.volatilePrivatePermissions", true);
 pref("noscript.clearClick", 0);
 
 # PDF.js
-// needs to be a user_pref because pdf.js blows away non-user prefs with it's 
own defaults each time
+// needs to be a user_pref because pdf.js blows away non-user prefs with its 
own
+// defaults each time
 user_pref("pdfjs.disableRange", true);
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 9476edc..c81a7bf 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
@@ -58,5 +58,6 @@ pref("noscript.volatilePrivatePermissions", true);
 pref("noscript.clearClick", 0);
 
 # PDF.js
-// needs to be a user_pref because pdf.js blows away non-user prefs with it's 
own defaults each time
+// needs to be a user_pref because pdf.js blows away non-user prefs with its 
own
+// defaults each time
 user_pref("pdfjs.disableRange", true);
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 9476edc..c81a7bf 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
@@ -58,5 +58,6 @@ pref("noscript.volatilePrivatePermissions", true);
 pref("noscript.clearClick", 0);
 
 # PDF.js
-// needs to be a user_pref because pdf.js blows away non-user prefs with it's 
own defaults each time
+// needs to be a user_pref because pdf.js blows away non-user prefs with its 
own
+// defaults each time
 user_pref("pdfjs.disableRange", true);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2018-02-21 Thread translation

commit ad47497fb4294149d480a800eccb6b9477ab706a
Author: Translation commit bot 
Date:   Wed Feb 21 22:22:35 2018 +

Update translations for tor-browser-manual
---
 ar/ar.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ar/ar.po b/ar/ar.po
index 72755bee7..4490e3f51 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -10,7 +10,7 @@
 # blah bleh , 2017
 # Jacob Leppek, 2017
 # mohammad ali , 2017
-# ButterflyOfFire, 2018
+# ButterflyOfFire , 2018
 # ducki2p , 2018
 # Ali , 2018
 msgid ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-build/master] Bump build version

2018-02-21 Thread gk

commit 84c9b9ff0fb7f85ac776835f2ab930ef222d7f06
Author: Georg Koppen 
Date:   Wed Feb 21 18:56:08 2018 +

Bump build version
---
 rbm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rbm.conf b/rbm.conf
index 83f35f6..f6a9212 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
 
 var:
   torbrowser_version: '8.0a2'
-  torbrowser_build: 'build2'
+  torbrowser_build: 'build3'
   torbrowser_incremental_from:
 - 8.0a1
   project_name: tor-browser

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-build/master] Bug 25327: create -debug.tar.xz files instead of -debug.tar.gz files

2018-02-21 Thread gk

commit 3699792995ef75ff516fba20b1534e9722ab2f50
Author: Nicolas Vigier 
Date:   Wed Feb 21 18:13:58 2018 +0100

Bug 25327: create *-debug.tar.xz files instead of *-debug.tar.gz files
---
 projects/firefox/build | 2 +-
 projects/tor-browser/build | 4 ++--
 projects/tor/build | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index 051d573..a7441bd 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -199,7 +199,7 @@ END;
 [% IF c("var/linux") %]
 [% c('tar', {
 tar_src => [ 'Debug' ],
-tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ 
'/tor-browser-debug.tar.gz',
+tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ 
'/tor-browser-debug.tar.xz',
 }) %]
 [% END %]
 
diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index 655e157..978d988 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -299,8 +299,8 @@ rm -rf $distdir/${PKG_DIR}
 
 cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/
 [% IF c("var/linux") -%]
-  cp $rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-debug.tar.gz 
"$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.gz
-  cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.gz 
"$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.gz
+  cp $rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-debug.tar.xz 
"$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.xz
+  cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz 
"$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz
 [% END -%]
 
 # If we did not create a multi-lingual package above, create a package for
diff --git a/projects/tor/build b/projects/tor/build
index f6b507f..eeeaa5c 100644
--- a/projects/tor/build
+++ b/projects/tor/build
@@ -133,6 +133,6 @@ mkdir -p [% dest_dir _ '/' _ c('filename') %]
 [% IF c("var/linux") %]
 [% c('tar', {
 tar_src => [ 'Debug' ],
-tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ 
'/tor-debug.tar.gz',
+tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ 
'/tor-debug.tar.xz',
 }) %]
 [% END %]

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] Add prop290: Continuously update consensus methods

2018-02-21 Thread nickm

commit c45e0778adf392733b75508642e8807786a38490
Author: Nick Mathewson 
Date:   Wed Feb 21 12:02:04 2018 -0500

Add prop290: Continuously update consensus methods
---
 proposals/000-index.txt   |  2 +
 proposals/290-deprecate-consensus-methods.txt | 77 +++
 2 files changed, 79 insertions(+)

diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index 503d752..e4eebf3 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -210,6 +210,7 @@ Proposals by number:
 287  Reduce circuit lifetime without overloading the network [OPEN]
 288  Privacy-Preserving Statistics with Privcount in Tor (Shamir version) 
[DRAFT]
 289  Authenticating sendme cells to mitigate bandwidth attacks [OPEN]
+290  Continuously update consensus methods [OPEN]
 
 
 Proposals by status:
@@ -269,6 +270,7 @@ Proposals by status:
286  Controller APIs for hibernation access on mobile
287  Reduce circuit lifetime without overloading the network
289  Authenticating sendme cells to mitigate bandwidth attacks
+   290  Continuously update consensus methods
  ACCEPTED:
172  GETINFO controller option for circuit information
173  GETINFO Option Expansion
diff --git a/proposals/290-deprecate-consensus-methods.txt 
b/proposals/290-deprecate-consensus-methods.txt
new file mode 100644
index 000..db047c8
--- /dev/null
+++ b/proposals/290-deprecate-consensus-methods.txt
@@ -0,0 +1,77 @@
+Filename: 290-deprecate-consensus-methods.txt
+Title: Continuously update consensus methods
+Author: Nick Mathewson
+Created: 2018-02-21
+Status: Open
+
+1. Background
+
+   Directory authorities use the "consensus method" mechanism to achieve
+   forward compatibility during voting.  When each authority publishes
+   its vote, it includes a list of numbered consensus methods that it
+   supports.  Each authority chooses to calculate the consensus
+   according to the highest consensus method it knows supported by more
+   than 2/3 of the voting authorities.  So long as all the authorities
+   have a method in common, they will all reach the same consensus.
+
+   Consensus method 1 was first introduced in the Tor 0.2.0 series
+   around 2008. But by 2012, we realized that we had a problem: we were
+   stuck documenting and supporting old consensus methods indefinitely.
+
+   With proposal 215, we deprecated and removed support for all
+   consensus methods before method 13.  That was good as far as it went,
+   but it didn't solve the problem going forward: the latest consensus
+   methods is now 28.
+
+   This proposal describes a policy for removing older consensus methods
+   going forward, so we won't have to keep supporting them forever.
+
+2. Proposal
+
+   I propose that from time to time, old consensus methods should be
+   deprecated.
+
+   Specifically, I propose that we deprecate all methods older than the
+   highest method supported in first stable release of the oldest LTS
+   (long-term support) release series.
+
+   For example, the current oldest LTS series is 0.2.5.x.  The first
+   stable release in that series was 0.2.5.10.  The highest consensus
+   method listed by 0.2.5.10 is 18.  Therefore, we should currently
+   consider ourselves free to deprecate all methods before 18.
+
+   Once 0.2.5.x is deprecated, 0.2.9.x will become the oldest LTS
+   series.  The first stable release in that series was 0.2.9.8.  The
+   highest consensus method listed by 0.2.9.8 is 25.  Therefore, once
+   0.2.5.x is deprecated (in May 2018), we may deprecate all methods
+   before 25.
+
+   When a consensus method is deprecated, it should no longer be listed
+   or implemented by the latest Tor releases.  (It's okay for older
+   authorities to keep advertising it.)
+
+   Most consensus methods add a feature that is used in "method M or
+   later". Deprecating method M-1 means that the feature is used in all
+   supported consensus methods. Therefore, we can remove any code that
+   makes the feature conditional on a consensus method, and any code for
+   previous implementations of the feature.
+
+   Some consensus methods remove a feature that was used up to method
+   N. Deprecating method M means that the feature is no longer used by
+   any supported consensus methods. Therefore, we can remove any code
+   that implements the feature.
+
+A. Acknowledgments
+
+   Thanks to isis and teor for the discussion that led to this proposal.
+   I believe that teor first suggested the policy described in section 2
+   above.
+
+B. Client and relay compatibility notes
+
+   Dear reader: you may be worrying that this proposal will cause old
+   clients or relays to stop working prematurely.  That is not the case.
+   Consensus methods determine how the authorities behave, but they do
+   not represent backward-incompatible changes in how they generate
+   their consensuses.
+

___
tor-commits mailing list

[tor-commits] [tor/maint-0.3.3] Fix a variable name in tor-rust-dependencies

2018-02-21 Thread nickm

commit d489e4847b1ec30cb127ce6db675e2316c1772e3
Author: Nick Mathewson 
Date:   Wed Feb 21 11:55:25 2018 -0500

Fix a variable name in tor-rust-dependencies
---
 doc/HACKING/GettingStartedRust.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/HACKING/GettingStartedRust.md 
b/doc/HACKING/GettingStartedRust.md
index 87b41b5e2..f5914bc87 100644
--- a/doc/HACKING/GettingStartedRust.md
+++ b/doc/HACKING/GettingStartedRust.md
@@ -79,7 +79,7 @@ you are in the top level of the repository) configure tor 
with:
 
 TOR_RUST_DEPENDENCIES='path_to_dependencies_directory' ./configure 
--enable-rust
 
-(Note that RUST_DEPENDENCIES must be the full path to the directory; it
+(Note that TOR_RUST_DEPENDENCIES must be the full path to the directory; it
 cannot be relative.)
 
 Assuming you used the above `git submodule` commands and you're in the

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Wrap GettingStartedRust.md to 72 columns.

2018-02-21 Thread nickm

commit d2bdb54d37706b2322b1a1fa0a85c72cf72acd9e
Author: Nick Mathewson 
Date:   Wed Feb 21 11:55:07 2018 -0500

Wrap GettingStartedRust.md to 72 columns.
---
 doc/HACKING/GettingStartedRust.md | 95 +--
 1 file changed, 51 insertions(+), 44 deletions(-)

diff --git a/doc/HACKING/GettingStartedRust.md 
b/doc/HACKING/GettingStartedRust.md
index 3f9cf82ea..87b41b5e2 100644
--- a/doc/HACKING/GettingStartedRust.md
+++ b/doc/HACKING/GettingStartedRust.md
@@ -9,17 +9,19 @@ Please read or review our documentation on Rust coding 
standards
 (`.../doc/HACKING/CodingStandardsRust.md`) before doing anything.
 
 Please also read
-[the Rust Code of Conduct](https://www.rust-lang.org/en-US/conduct.html). We 
aim
-to follow the good example set by the Rust community and be excellent to one
-another.  Let's be careful with each other, so we can be memory-safe together!
-
-Next, please contact us before rewriting anything!  Rust in Tor is still an
-experiment.  It is an experiment that we very much want to see succeed, so 
we're
-going slowly and carefully.  For the moment, it's also a completely
-volunteer-driven effort: while many, if not most, of us are paid to work on 
Tor,
-we are not yet funded to write Rust code for Tor.  Please be patient with the
-other people who are working on getting more Rust code into Tor, because they
-are graciously donating their free time to contribute to this effort.
+[the Rust Code of Conduct](https://www.rust-lang.org/en-US/conduct.html). We
+aim to follow the good example set by the Rust community and be
+excellent to one another.  Let's be careful with each other, so we can
+be memory-safe together!
+
+Next, please contact us before rewriting anything!  Rust in Tor is still
+an experiment.  It is an experiment that we very much want to see
+succeed, so we're going slowly and carefully.  For the moment, it's also
+a completely volunteer-driven effort: while many, if not most, of us are
+paid to work on Tor, we are not yet funded to write Rust code for Tor.
+Please be patient with the other people who are working on getting more
+Rust code into Tor, because they are graciously donating their free time
+to contribute to this effort.
 
  Resources for learning Rust
 -
@@ -33,14 +35,15 @@ Rust immediately, without waiting for anything to install, 
there is
 
 **Advanced resources**
 
-If you're interested in playing with various Rust compilers and viewing a very
-nicely displayed output of the generated assembly, there is
+If you're interested in playing with various Rust compilers and viewing
+a very nicely displayed output of the generated assembly, there is
 [the Godbolt compiler explorer](https://rust.godbolt.org/)
 
 For learning how to write unsafe Rust, read
 [The Rustonomicon](https://doc.rust-lang.org/nomicon/).
 
-For learning everything you ever wanted to know about Rust macros, there is
+For learning everything you ever wanted to know about Rust macros, there
+is
 [The Little Book of Rust 
Macros](https://danielkeep.github.io/tlborm/book/index.html).
 
 For learning more about FFI and Rust, see Jake Goulding's
@@ -49,10 +52,10 @@ For learning more about FFI and Rust, see Jake Goulding's
  Compiling Tor with Rust enabled
 -
 
-You will need to run the `configure` script with the `--enable-rust` flag to
-explicitly build with Rust. Additionally, you will need to specify where to
-fetch Rust dependencies, as we allow for either fetching dependencies from 
Cargo
-or specifying a local directory.
+You will need to run the `configure` script with the `--enable-rust`
+flag to explicitly build with Rust. Additionally, you will need to
+specify where to fetch Rust dependencies, as we allow for either
+fetching dependencies from Cargo or specifying a local directory.
 
 **Fetch dependencies from Cargo**
 
@@ -65,21 +68,22 @@ You'll need the following Rust dependencies (as of this 
writing):
 libc==0.2.22
 
 We vendor our Rust dependencies in a separate repo using
-[cargo-vendor](https://github.com/alexcrichton/cargo-vendor).  To use them, do:
+[cargo-vendor](https://github.com/alexcrichton/cargo-vendor).  To use
+them, do:
 
 git submodule init
 git submodule update
 
-To specify the local directory containing the dependencies, (assuming you are 
in
-the top level of the repository) configure tor with:
+To specify the local directory containing the dependencies, (assuming
+you are in the top level of the repository) configure tor with:
 
 TOR_RUST_DEPENDENCIES='path_to_dependencies_directory' ./configure 
--enable-rust
 
-(Note that RUST_DEPENDENCIES must be the full path to the directory; it cannot
-be relative.)
+(Note that RUST_DEPENDENCIES must be the full path to the directory; it
+cannot be relative.)
 
-Assuming you used the above `git submodule` commands and you're in the topmost
-directory of the repository, this would be:
+Assuming you used

[tor-commits] [tor/master] Fix a variable name in tor-rust-dependencies

2018-02-21 Thread nickm

commit d489e4847b1ec30cb127ce6db675e2316c1772e3
Author: Nick Mathewson 
Date:   Wed Feb 21 11:55:25 2018 -0500

Fix a variable name in tor-rust-dependencies
---
 doc/HACKING/GettingStartedRust.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/HACKING/GettingStartedRust.md 
b/doc/HACKING/GettingStartedRust.md
index 87b41b5e2..f5914bc87 100644
--- a/doc/HACKING/GettingStartedRust.md
+++ b/doc/HACKING/GettingStartedRust.md
@@ -79,7 +79,7 @@ you are in the top level of the repository) configure tor 
with:
 
 TOR_RUST_DEPENDENCIES='path_to_dependencies_directory' ./configure 
--enable-rust
 
-(Note that RUST_DEPENDENCIES must be the full path to the directory; it
+(Note that TOR_RUST_DEPENDENCIES must be the full path to the directory; it
 cannot be relative.)
 
 Assuming you used the above `git submodule` commands and you're in the



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Wrap GettingStartedRust.md to 72 columns.

2018-02-21 Thread nickm

commit d2bdb54d37706b2322b1a1fa0a85c72cf72acd9e
Author: Nick Mathewson 
Date:   Wed Feb 21 11:55:07 2018 -0500

Wrap GettingStartedRust.md to 72 columns.
---
 doc/HACKING/GettingStartedRust.md | 95 +--
 1 file changed, 51 insertions(+), 44 deletions(-)

diff --git a/doc/HACKING/GettingStartedRust.md 
b/doc/HACKING/GettingStartedRust.md
index 3f9cf82ea..87b41b5e2 100644
--- a/doc/HACKING/GettingStartedRust.md
+++ b/doc/HACKING/GettingStartedRust.md
@@ -9,17 +9,19 @@ Please read or review our documentation on Rust coding 
standards
 (`.../doc/HACKING/CodingStandardsRust.md`) before doing anything.
 
 Please also read
-[the Rust Code of Conduct](https://www.rust-lang.org/en-US/conduct.html). We 
aim
-to follow the good example set by the Rust community and be excellent to one
-another.  Let's be careful with each other, so we can be memory-safe together!
-
-Next, please contact us before rewriting anything!  Rust in Tor is still an
-experiment.  It is an experiment that we very much want to see succeed, so 
we're
-going slowly and carefully.  For the moment, it's also a completely
-volunteer-driven effort: while many, if not most, of us are paid to work on 
Tor,
-we are not yet funded to write Rust code for Tor.  Please be patient with the
-other people who are working on getting more Rust code into Tor, because they
-are graciously donating their free time to contribute to this effort.
+[the Rust Code of Conduct](https://www.rust-lang.org/en-US/conduct.html). We
+aim to follow the good example set by the Rust community and be
+excellent to one another.  Let's be careful with each other, so we can
+be memory-safe together!
+
+Next, please contact us before rewriting anything!  Rust in Tor is still
+an experiment.  It is an experiment that we very much want to see
+succeed, so we're going slowly and carefully.  For the moment, it's also
+a completely volunteer-driven effort: while many, if not most, of us are
+paid to work on Tor, we are not yet funded to write Rust code for Tor.
+Please be patient with the other people who are working on getting more
+Rust code into Tor, because they are graciously donating their free time
+to contribute to this effort.
 
  Resources for learning Rust
 -
@@ -33,14 +35,15 @@ Rust immediately, without waiting for anything to install, 
there is
 
 **Advanced resources**
 
-If you're interested in playing with various Rust compilers and viewing a very
-nicely displayed output of the generated assembly, there is
+If you're interested in playing with various Rust compilers and viewing
+a very nicely displayed output of the generated assembly, there is
 [the Godbolt compiler explorer](https://rust.godbolt.org/)
 
 For learning how to write unsafe Rust, read
 [The Rustonomicon](https://doc.rust-lang.org/nomicon/).
 
-For learning everything you ever wanted to know about Rust macros, there is
+For learning everything you ever wanted to know about Rust macros, there
+is
 [The Little Book of Rust 
Macros](https://danielkeep.github.io/tlborm/book/index.html).
 
 For learning more about FFI and Rust, see Jake Goulding's
@@ -49,10 +52,10 @@ For learning more about FFI and Rust, see Jake Goulding's
  Compiling Tor with Rust enabled
 -
 
-You will need to run the `configure` script with the `--enable-rust` flag to
-explicitly build with Rust. Additionally, you will need to specify where to
-fetch Rust dependencies, as we allow for either fetching dependencies from 
Cargo
-or specifying a local directory.
+You will need to run the `configure` script with the `--enable-rust`
+flag to explicitly build with Rust. Additionally, you will need to
+specify where to fetch Rust dependencies, as we allow for either
+fetching dependencies from Cargo or specifying a local directory.
 
 **Fetch dependencies from Cargo**
 
@@ -65,21 +68,22 @@ You'll need the following Rust dependencies (as of this 
writing):
 libc==0.2.22
 
 We vendor our Rust dependencies in a separate repo using
-[cargo-vendor](https://github.com/alexcrichton/cargo-vendor).  To use them, do:
+[cargo-vendor](https://github.com/alexcrichton/cargo-vendor).  To use
+them, do:
 
 git submodule init
 git submodule update
 
-To specify the local directory containing the dependencies, (assuming you are 
in
-the top level of the repository) configure tor with:
+To specify the local directory containing the dependencies, (assuming
+you are in the top level of the repository) configure tor with:
 
 TOR_RUST_DEPENDENCIES='path_to_dependencies_directory' ./configure 
--enable-rust
 
-(Note that RUST_DEPENDENCIES must be the full path to the directory; it cannot
-be relative.)
+(Note that RUST_DEPENDENCIES must be the full path to the directory; it
+cannot be relative.)
 
-Assuming you used the above `git submodule` commands and you're in the topmost
-directory of the repository, this would be:
+Assuming you used

[tor-commits] [tor/release-0.3.3] Fix a variable name in tor-rust-dependencies

2018-02-21 Thread nickm

commit d489e4847b1ec30cb127ce6db675e2316c1772e3
Author: Nick Mathewson 
Date:   Wed Feb 21 11:55:25 2018 -0500

Fix a variable name in tor-rust-dependencies
---
 doc/HACKING/GettingStartedRust.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/HACKING/GettingStartedRust.md 
b/doc/HACKING/GettingStartedRust.md
index 87b41b5e2..f5914bc87 100644
--- a/doc/HACKING/GettingStartedRust.md
+++ b/doc/HACKING/GettingStartedRust.md
@@ -79,7 +79,7 @@ you are in the top level of the repository) configure tor 
with:
 
 TOR_RUST_DEPENDENCIES='path_to_dependencies_directory' ./configure 
--enable-rust
 
-(Note that RUST_DEPENDENCIES must be the full path to the directory; it
+(Note that TOR_RUST_DEPENDENCIES must be the full path to the directory; it
 cannot be relative.)
 
 Assuming you used the above `git submodule` commands and you're in the

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Wrap GettingStartedRust.md to 72 columns.

2018-02-21 Thread nickm

commit d2bdb54d37706b2322b1a1fa0a85c72cf72acd9e
Author: Nick Mathewson 
Date:   Wed Feb 21 11:55:07 2018 -0500

Wrap GettingStartedRust.md to 72 columns.
---
 doc/HACKING/GettingStartedRust.md | 95 +--
 1 file changed, 51 insertions(+), 44 deletions(-)

diff --git a/doc/HACKING/GettingStartedRust.md 
b/doc/HACKING/GettingStartedRust.md
index 3f9cf82ea..87b41b5e2 100644
--- a/doc/HACKING/GettingStartedRust.md
+++ b/doc/HACKING/GettingStartedRust.md
@@ -9,17 +9,19 @@ Please read or review our documentation on Rust coding 
standards
 (`.../doc/HACKING/CodingStandardsRust.md`) before doing anything.
 
 Please also read
-[the Rust Code of Conduct](https://www.rust-lang.org/en-US/conduct.html). We 
aim
-to follow the good example set by the Rust community and be excellent to one
-another.  Let's be careful with each other, so we can be memory-safe together!
-
-Next, please contact us before rewriting anything!  Rust in Tor is still an
-experiment.  It is an experiment that we very much want to see succeed, so 
we're
-going slowly and carefully.  For the moment, it's also a completely
-volunteer-driven effort: while many, if not most, of us are paid to work on 
Tor,
-we are not yet funded to write Rust code for Tor.  Please be patient with the
-other people who are working on getting more Rust code into Tor, because they
-are graciously donating their free time to contribute to this effort.
+[the Rust Code of Conduct](https://www.rust-lang.org/en-US/conduct.html). We
+aim to follow the good example set by the Rust community and be
+excellent to one another.  Let's be careful with each other, so we can
+be memory-safe together!
+
+Next, please contact us before rewriting anything!  Rust in Tor is still
+an experiment.  It is an experiment that we very much want to see
+succeed, so we're going slowly and carefully.  For the moment, it's also
+a completely volunteer-driven effort: while many, if not most, of us are
+paid to work on Tor, we are not yet funded to write Rust code for Tor.
+Please be patient with the other people who are working on getting more
+Rust code into Tor, because they are graciously donating their free time
+to contribute to this effort.
 
  Resources for learning Rust
 -
@@ -33,14 +35,15 @@ Rust immediately, without waiting for anything to install, 
there is
 
 **Advanced resources**
 
-If you're interested in playing with various Rust compilers and viewing a very
-nicely displayed output of the generated assembly, there is
+If you're interested in playing with various Rust compilers and viewing
+a very nicely displayed output of the generated assembly, there is
 [the Godbolt compiler explorer](https://rust.godbolt.org/)
 
 For learning how to write unsafe Rust, read
 [The Rustonomicon](https://doc.rust-lang.org/nomicon/).
 
-For learning everything you ever wanted to know about Rust macros, there is
+For learning everything you ever wanted to know about Rust macros, there
+is
 [The Little Book of Rust 
Macros](https://danielkeep.github.io/tlborm/book/index.html).
 
 For learning more about FFI and Rust, see Jake Goulding's
@@ -49,10 +52,10 @@ For learning more about FFI and Rust, see Jake Goulding's
  Compiling Tor with Rust enabled
 -
 
-You will need to run the `configure` script with the `--enable-rust` flag to
-explicitly build with Rust. Additionally, you will need to specify where to
-fetch Rust dependencies, as we allow for either fetching dependencies from 
Cargo
-or specifying a local directory.
+You will need to run the `configure` script with the `--enable-rust`
+flag to explicitly build with Rust. Additionally, you will need to
+specify where to fetch Rust dependencies, as we allow for either
+fetching dependencies from Cargo or specifying a local directory.
 
 **Fetch dependencies from Cargo**
 
@@ -65,21 +68,22 @@ You'll need the following Rust dependencies (as of this 
writing):
 libc==0.2.22
 
 We vendor our Rust dependencies in a separate repo using
-[cargo-vendor](https://github.com/alexcrichton/cargo-vendor).  To use them, do:
+[cargo-vendor](https://github.com/alexcrichton/cargo-vendor).  To use
+them, do:
 
 git submodule init
 git submodule update
 
-To specify the local directory containing the dependencies, (assuming you are 
in
-the top level of the repository) configure tor with:
+To specify the local directory containing the dependencies, (assuming
+you are in the top level of the repository) configure tor with:
 
 TOR_RUST_DEPENDENCIES='path_to_dependencies_directory' ./configure 
--enable-rust
 
-(Note that RUST_DEPENDENCIES must be the full path to the directory; it cannot
-be relative.)
+(Note that RUST_DEPENDENCIES must be the full path to the directory; it
+cannot be relative.)
 
-Assuming you used the above `git submodule` commands and you're in the topmost
-directory of the repository, this would be:
+Assuming you used

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

2018-02-21 Thread nickm

commit e87a2759f3d7b51445334bccd1265427393e5528
Merge: 62c88a601 d489e4847
Author: Nick Mathewson 
Date:   Wed Feb 21 11:56:02 2018 -0500

Merge branch 'maint-0.3.3'

 doc/HACKING/GettingStartedRust.md | 95 +--
 1 file changed, 51 insertions(+), 44 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Update the .gitmodules to refer to project-level tor-rust-dependencies

2018-02-21 Thread nickm

commit ac1942ac58d631af036acc97c73dad9d89b23aaf
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:04 2018 -0500

Update the .gitmodules to refer to project-level tor-rust-dependencies

Closes most of #25323.
---
 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 7074403c9..8f8040565 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/ext/rust"]
path = src/ext/rust
-   url = https://git.torproject.org/user/sebastian/tor-rust-dependencies
+   url = https://git.torproject.org/tor-rust-dependencies
diff --git a/changes/ticket25323 b/changes/ticket25323
new file mode 100644
index 0..836825de5
--- /dev/null
+++ b/changes/ticket25323
@@ -0,0 +1,4 @@
+  o Code simplification and refactoring:
+- Update the "rust dependencies" submodule to be an project-level
+  repository, rather than a user repository. Closes ticket 25323.
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-02-21 Thread nickm

commit bcfb034957dbd5d891befcd99a9725a225903b4e
Merge: bd71e0a0c ac1942ac5
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:50 2018 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-02-21 Thread nickm

commit bcfb034957dbd5d891befcd99a9725a225903b4e
Merge: bd71e0a0c ac1942ac5
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:50 2018 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Update the .gitmodules to refer to project-level tor-rust-dependencies

2018-02-21 Thread nickm

commit ac1942ac58d631af036acc97c73dad9d89b23aaf
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:04 2018 -0500

Update the .gitmodules to refer to project-level tor-rust-dependencies

Closes most of #25323.
---
 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 7074403c9..8f8040565 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/ext/rust"]
path = src/ext/rust
-   url = https://git.torproject.org/user/sebastian/tor-rust-dependencies
+   url = https://git.torproject.org/tor-rust-dependencies
diff --git a/changes/ticket25323 b/changes/ticket25323
new file mode 100644
index 0..836825de5
--- /dev/null
+++ b/changes/ticket25323
@@ -0,0 +1,4 @@
+  o Code simplification and refactoring:
+- Update the "rust dependencies" submodule to be an project-level
+  repository, rather than a user repository. Closes ticket 25323.
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Update the .gitmodules to refer to project-level tor-rust-dependencies

2018-02-21 Thread nickm

commit ac1942ac58d631af036acc97c73dad9d89b23aaf
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:04 2018 -0500

Update the .gitmodules to refer to project-level tor-rust-dependencies

Closes most of #25323.
---
 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 7074403c9..8f8040565 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/ext/rust"]
path = src/ext/rust
-   url = https://git.torproject.org/user/sebastian/tor-rust-dependencies
+   url = https://git.torproject.org/tor-rust-dependencies
diff --git a/changes/ticket25323 b/changes/ticket25323
new file mode 100644
index 0..836825de5
--- /dev/null
+++ b/changes/ticket25323
@@ -0,0 +1,4 @@
+  o Code simplification and refactoring:
+- Update the "rust dependencies" submodule to be an project-level
+  repository, rather than a user repository. Closes ticket 25323.
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

2018-02-21 Thread nickm

commit 60d3a3c754b7d02e7fcb5e9cb6216fdd4062c3b2
Merge: 7e2e8ac24 ac1942ac5
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:50 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-02-21 Thread nickm

commit 8a5cb58ad0b8e553d9df24aca02b0f8af5c0d47c
Merge: 6384d314f bcfb03495
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:50 2018 -0500

Merge branch 'maint-0.3.2' into maint-0.3.3

 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

2018-02-21 Thread nickm

commit 62c88a60111fa4bbd23cfe7bb604b827981cc81c
Merge: fc22bcadb 8a5cb58ad
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:50 2018 -0500

Merge branch 'maint-0.3.3'

 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-02-21 Thread nickm

commit bcfb034957dbd5d891befcd99a9725a225903b4e
Merge: bd71e0a0c ac1942ac5
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:50 2018 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-02-21 Thread nickm

commit bcfb034957dbd5d891befcd99a9725a225903b4e
Merge: bd71e0a0c ac1942ac5
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:50 2018 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-02-21 Thread nickm

commit 8a5cb58ad0b8e553d9df24aca02b0f8af5c0d47c
Merge: 6384d314f bcfb03495
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:50 2018 -0500

Merge branch 'maint-0.3.2' into maint-0.3.3

 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-02-21 Thread nickm

commit 8a5cb58ad0b8e553d9df24aca02b0f8af5c0d47c
Merge: 6384d314f bcfb03495
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:50 2018 -0500

Merge branch 'maint-0.3.2' into maint-0.3.3

 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-02-21 Thread nickm

commit 1c561819832883b869554614de90e3d13ef120a0
Merge: 434942ea5 bcfb03495
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:50 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Update the .gitmodules to refer to project-level tor-rust-dependencies

2018-02-21 Thread nickm

commit ac1942ac58d631af036acc97c73dad9d89b23aaf
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:04 2018 -0500

Update the .gitmodules to refer to project-level tor-rust-dependencies

Closes most of #25323.
---
 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 7074403c9..8f8040565 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/ext/rust"]
path = src/ext/rust
-   url = https://git.torproject.org/user/sebastian/tor-rust-dependencies
+   url = https://git.torproject.org/tor-rust-dependencies
diff --git a/changes/ticket25323 b/changes/ticket25323
new file mode 100644
index 0..836825de5
--- /dev/null
+++ b/changes/ticket25323
@@ -0,0 +1,4 @@
+  o Code simplification and refactoring:
+- Update the "rust dependencies" submodule to be an project-level
+  repository, rather than a user repository. Closes ticket 25323.
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Update the .gitmodules to refer to project-level tor-rust-dependencies

2018-02-21 Thread nickm

commit ac1942ac58d631af036acc97c73dad9d89b23aaf
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:04 2018 -0500

Update the .gitmodules to refer to project-level tor-rust-dependencies

Closes most of #25323.
---
 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 7074403c9..8f8040565 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/ext/rust"]
path = src/ext/rust
-   url = https://git.torproject.org/user/sebastian/tor-rust-dependencies
+   url = https://git.torproject.org/tor-rust-dependencies
diff --git a/changes/ticket25323 b/changes/ticket25323
new file mode 100644
index 0..836825de5
--- /dev/null
+++ b/changes/ticket25323
@@ -0,0 +1,4 @@
+  o Code simplification and refactoring:
+- Update the "rust dependencies" submodule to be an project-level
+  repository, rather than a user repository. Closes ticket 25323.
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-02-21 Thread nickm

commit bcfb034957dbd5d891befcd99a9725a225903b4e
Merge: bd71e0a0c ac1942ac5
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:50 2018 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Update the .gitmodules to refer to project-level tor-rust-dependencies

2018-02-21 Thread nickm

commit ac1942ac58d631af036acc97c73dad9d89b23aaf
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:04 2018 -0500

Update the .gitmodules to refer to project-level tor-rust-dependencies

Closes most of #25323.
---
 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 7074403c9..8f8040565 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/ext/rust"]
path = src/ext/rust
-   url = https://git.torproject.org/user/sebastian/tor-rust-dependencies
+   url = https://git.torproject.org/tor-rust-dependencies
diff --git a/changes/ticket25323 b/changes/ticket25323
new file mode 100644
index 0..836825de5
--- /dev/null
+++ b/changes/ticket25323
@@ -0,0 +1,4 @@
+  o Code simplification and refactoring:
+- Update the "rust dependencies" submodule to be an project-level
+  repository, rather than a user repository. Closes ticket 25323.
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Update the .gitmodules to refer to project-level tor-rust-dependencies

2018-02-21 Thread nickm

commit ac1942ac58d631af036acc97c73dad9d89b23aaf
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:04 2018 -0500

Update the .gitmodules to refer to project-level tor-rust-dependencies

Closes most of #25323.
---
 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 7074403c9..8f8040565 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/ext/rust"]
path = src/ext/rust
-   url = https://git.torproject.org/user/sebastian/tor-rust-dependencies
+   url = https://git.torproject.org/tor-rust-dependencies
diff --git a/changes/ticket25323 b/changes/ticket25323
new file mode 100644
index 0..836825de5
--- /dev/null
+++ b/changes/ticket25323
@@ -0,0 +1,4 @@
+  o Code simplification and refactoring:
+- Update the "rust dependencies" submodule to be an project-level
+  repository, rather than a user repository. Closes ticket 25323.
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/whisperback] Update translations for whisperback

2018-02-21 Thread translation

commit 7c57495036cad643c323a86f421e23debfa21b6c
Author: Translation commit bot 
Date:   Wed Feb 21 14:45:25 2018 +

Update translations for whisperback
---
 sk/sk.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sk/sk.po b/sk/sk.po
index 18db96a1f..f120dcdd4 100644
--- a/sk/sk.po
+++ b/sk/sk.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2018-02-20 18:43+\n"
-"Last-Translator: Roman 'Kaktuxista' Benji \n"
+"PO-Revision-Date: 2018-02-21 14:38+\n"
+"Last-Translator: Robert Kirschner \n"
 "Language-Team: Slovak 
(http://www.transifex.com/otf/torproject/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Revert 4438ef32's changes to test_address.c

2018-02-21 Thread nickm

commit fc22bcadb51bcabb9b9c16a9768adbe86788b7f1
Author: Nick Mathewson 
Date:   Wed Feb 21 09:35:48 2018 -0500

Revert 4438ef32's changes to test_address.c

Apparently some versions of the mac sdk care about the ordering of
net/if.h wrt other headers.

Fixes bug 25319; bug not in any released tor.
---
 src/test/test_address.c | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/test/test_address.c b/src/test/test_address.c
index 0dd7b4033..9c88d37a4 100644
--- a/src/test/test_address.c
+++ b/src/test/test_address.c
@@ -11,11 +11,8 @@
 #include 
 #endif
 
-#ifdef HAVE_NET_IF_H
-#include 
-#endif
-
 #ifdef HAVE_IFADDRS_TO_SMARTLIST
+#include 
 #include 
 #endif
 
@@ -23,6 +20,7 @@
 #ifdef HAVE_SYS_IOCTL_H
 #include 
 #endif
+#include 
 #endif /* defined(HAVE_IFCONF_TO_SMARTLIST) */
 
 #include "or.h"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2018-02-21 Thread translation

commit 3c67f2ef2fedb937ab382d2ca990183a8d742c28
Author: Translation commit bot 
Date:   Wed Feb 21 11:17:06 2018 +

Update translations for tails-misc
---
 sv.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sv.po b/sv.po
index 1d0dbfc9f..aa1350a76 100644
--- a/sv.po
+++ b/sv.po
@@ -9,6 +9,7 @@
 # Filip Nyquist , 2015
 # Gabor Sebastiani, 2014
 # Henrik Mattsson-MÃ¥rn , 2017
+# Jacob Andersson , 2018
 # falk3n , 2014
 # Jonatan Nyberg, 2017
 # Jonatan Nyberg, 2017
@@ -23,7 +24,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-02-20 11:29+0100\n"
-"PO-Revision-Date: 2018-02-21 10:46+\n"
+"PO-Revision-Date: 2018-02-21 10:53+\n"
 "Last-Translator: Jacob Andersson \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -240,7 +241,7 @@ msgstr "BÃ¥de vÃ¤rdsystemet och virtualiseringsmjukvaran 
kan se allt du gÃ¶r i T
 
 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:76
 msgid "Warning: non-free virtual machine detected!"
-msgstr "Varning: virtuell maskin som inte Ã¤r fri pÃ¥trÃ¤ffad!"
+msgstr "Varning: virtuell maskin som inte Ã¤r fri upptÃ¤cktes!"
 
 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:78
 msgid ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2018-02-21 Thread translation

commit 0db4dbaaa31b30d3eadd1ca313de7261b218fafe
Author: Translation commit bot 
Date:   Wed Feb 21 10:47:07 2018 +

Update translations for tails-misc
---
 sv.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv.po b/sv.po
index 7fc75e4d1..1d0dbfc9f 100644
--- a/sv.po
+++ b/sv.po
@@ -23,8 +23,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-02-20 11:29+0100\n"
-"PO-Revision-Date: 2018-02-20 19:03+\n"
-"Last-Translator: Henrik Mattsson-MÃ¥rn \n"
+"PO-Revision-Date: 2018-02-21 10:46+\n"
+"Last-Translator: Jacob Andersson \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-build/master] Bump build version

2018-02-21 Thread gk

commit 8bf3bb215393f78df81cf6a1ed3eeae6432f9f9b
Author: Georg Koppen 
Date:   Wed Feb 21 10:18:34 2018 +

Bump build version
---
 rbm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rbm.conf b/rbm.conf
index b1ad4c4..83f35f6 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
 
 var:
   torbrowser_version: '8.0a2'
-  torbrowser_build: 'build1'
+  torbrowser_build: 'build2'
   torbrowser_incremental_from:
 - 8.0a1
   project_name: tor-browser

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-build/master] Bug 22612: Add script to hash signed bundles

2018-02-21 Thread gk

commit 011e0d3d3da5263efa29b9a5963caa083f4c3ff5
Author: Georg Koppen 
Date:   Wed Feb 21 10:15:54 2018 +

Bug 22612: Add script to hash signed bundles
---
 tools/hash_signed_bundles.sh | 50 
 1 file changed, 50 insertions(+)

diff --git a/tools/hash_signed_bundles.sh b/tools/hash_signed_bundles.sh
new file mode 100755
index 000..4354d47
--- /dev/null
+++ b/tools/hash_signed_bundles.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+# Copyright (c) 2018, The Tor Project, Inc.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#
+# * Neither the names of the copyright owners nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Usage:
+# 1) Change into the directory containing the files to be hashed
+# 2) Run /path/to/hash_signed_bundles.sh
+
+export LC_ALL=C
+
+rm -f sha256sums-signed-build.txt sha256sums-signed-build.incrementals.txt
+sha256sum `ls -1 | grep -v '\.incremental\.mar$' | grep -v '^sha256sums*' | \
+  sort` > sha256sums-signed-build.txt
+
+if ls -1 | grep -q '\.incremental\.mar$'
+then
+  sha256sum `ls -1 | grep '\.incremental\.mar$' | \
+sort` > sha256sums-signed-build.incrementals.txt
+fi
+
+echo "Hashing the signed bundles done."
+exit 0

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2018-02-21 Thread translation

commit c5a5701858f5ba2cba1e92babda19b89287072bb
Author: Translation commit bot 
Date:   Wed Feb 21 10:17:13 2018 +

Update translations for tails-misc_completed
---
 es.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/es.po b/es.po
index cc49026fb..008a90185 100644
--- a/es.po
+++ b/es.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-02-20 11:29+0100\n"
-"PO-Revision-Date: 2018-02-21 09:21+\n"
+"PO-Revision-Date: 2018-02-21 09:50+\n"
 "Last-Translator: Emma Peel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -140,7 +140,7 @@ msgstr "No hemos podido ver si habÃa actualizaciones. Esto 
puede ser debido a u
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153
 msgid "Your additional software are up to date"
-msgstr "Tu software adicional estÃ¡ actualizado."
+msgstr "Tu software adicional ha sido actualizado."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:154
 msgid "The upgrade was successful."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2018-02-21 Thread translation

commit 40f867997d0c7bb78fdb10e950d0faade1ed9c8a
Author: Translation commit bot 
Date:   Wed Feb 21 10:17:08 2018 +

Update translations for tails-misc
---
 es.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/es.po b/es.po
index cc49026fb..008a90185 100644
--- a/es.po
+++ b/es.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-02-20 11:29+0100\n"
-"PO-Revision-Date: 2018-02-21 09:21+\n"
+"PO-Revision-Date: 2018-02-21 09:50+\n"
 "Last-Translator: Emma Peel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -140,7 +140,7 @@ msgstr "No hemos podido ver si habÃa actualizaciones. Esto 
puede ser debido a u
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153
 msgid "Your additional software are up to date"
-msgstr "Tu software adicional estÃ¡ actualizado."
+msgstr "Tu software adicional ha sido actualizado."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:154
 msgid "The upgrade was successful."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-build/master] Bug 24879: enable fetching of new commits by default for nightly builds

2018-02-21 Thread gk

commit 95b5c738d8e1a11596e652363e801e500c5733de
Author: Nicolas Vigier 
Date:   Mon Jan 15 19:26:28 2018 +0100

Bug 24879: enable fetching of new commits by default for nightly builds
---
 README |  3 ++-
 rbm.conf   |  1 +
 rbm.local.conf.example | 13 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/README b/README
index a449f9d..d498c05 100644
--- a/README
+++ b/README
@@ -89,7 +89,8 @@ Updating git sources
 
 You can run "make fetch" to fetch the latest sources from git for all
 components included in Tor Browser. You should run this if you want to
-make a nightly build with the latest commits.
+make a nightly build with the latest commits, and you disabled automatic
+fetching of new commits for nightly builds in rbm.local.conf.
 
 
 Number of make processes
diff --git a/rbm.conf b/rbm.conf
index 76b7627..b1ad4c4 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -112,6 +112,7 @@ targets:
   alpha: 1
   channel: alpha
   nightly:
+fetch: 1
 var:
   nightly: 1
   channel: nightly
diff --git a/rbm.local.conf.example b/rbm.local.conf.example
index a6401a9..916cb5e 100644
--- a/rbm.local.conf.example
+++ b/rbm.local.conf.example
@@ -96,4 +96,17 @@ targets:
   ### Uncomment this if you want to create mar files in your test build.
   #build_mar: 1
 
+  nightly:
+
+### By default 'fetch' is set to 1 for nightly builds, meaning that new
+### commits will be fetched automatically during each build. You can
+### disable this during developement if you want to do rebuilds to test
+### a specific change, but don't want rebuilds caused by unrelated
+### changes, or if you want to decide at which point new commits are
+### fetched. When 'fetch' is set to 'if_needed', new commits will only
+### be fetched if the selected commit (or branch, or tag) is not present,
+### which means that existing branches won't be updated. In that case
+### you can fetch new commits by running 'make fetch'.
+#fetch: 'if_needed'
+
 # vim: filetype=yaml sw=2

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2018-02-21 Thread translation

commit 6240d19f388c9f95d2a8072202e7ba4a954fe3e4
Author: Translation commit bot 
Date:   Wed Feb 21 09:47:10 2018 +

Update translations for tails-misc_completed
---
 es.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/es.po b/es.po
index 4f1469ee7..cc49026fb 100644
--- a/es.po
+++ b/es.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-02-20 11:29+0100\n"
-"PO-Revision-Date: 2018-02-21 09:16+\n"
+"PO-Revision-Date: 2018-02-21 09:21+\n"
 "Last-Translator: Emma Peel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -116,7 +116,7 @@ msgstr "Ha fallado tu sistema de instalaciÃ³n de software 
adicional"
 msgid ""
 "The installation failed. Please check your additional software "
 "configuration, or read the system log to understand better the problem."
-msgstr "La instalaciÃ³n fallÃ³. Comprueba la configuraciÃ³n de tu software 
adicional, o lee el log system para entender mejor el problema, gracias."
+msgstr "La instalaciÃ³n fallÃ³. Comprueba la configuraciÃ³n de tu software 
adicional, o lee el log system para entender mejor el problema."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:126
 msgid "Your additional software are installed"
@@ -124,7 +124,7 @@ msgstr "Se ha instalado tu software adicional"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:127
 msgid "Your additional software are ready to use."
-msgstr "Tu software adicional se estÃ¡ usando."
+msgstr "Tu software adicional estÃ¡ listo para usar."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:138
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:157
@@ -136,11 +136,11 @@ msgid ""
 "The check for upgrades failed. This might be due to a network problem. "
 "Please check your network connection, try to restart Tails, or read the "
 "system log to understand better the problem."
-msgstr "FallÃ³, la actualizaciÃ³n. Puede ser por problemas de red. Revisa la 
conexiÃ³n, reinicia Tails, o revisa system log para entender mejor el problema. 
Gracias."
+msgstr "No hemos podido ver si habÃa actualizaciones. Esto puede ser debido a 
un problema de la red. Comprueba tu conexiÃ³n de red, intenta reiniciar Tails, 
o lee el registro ('log') del sistema para comprender mejor el problema."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153
 msgid "Your additional software are up to date"
-msgstr "Se va a actualizar tu software de red."
+msgstr "Tu software adicional estÃ¡ actualizado."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:154
 msgid "The upgrade was successful."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2018-02-21 Thread translation

commit 73302ea4b5adfb0383f2d5a066749a9086e4f8b1
Author: Translation commit bot 
Date:   Wed Feb 21 09:47:05 2018 +

Update translations for tails-misc
---
 es.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/es.po b/es.po
index 4f1469ee7..cc49026fb 100644
--- a/es.po
+++ b/es.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-02-20 11:29+0100\n"
-"PO-Revision-Date: 2018-02-21 09:16+\n"
+"PO-Revision-Date: 2018-02-21 09:21+\n"
 "Last-Translator: Emma Peel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -116,7 +116,7 @@ msgstr "Ha fallado tu sistema de instalaciÃ³n de software 
adicional"
 msgid ""
 "The installation failed. Please check your additional software "
 "configuration, or read the system log to understand better the problem."
-msgstr "La instalaciÃ³n fallÃ³. Comprueba la configuraciÃ³n de tu software 
adicional, o lee el log system para entender mejor el problema, gracias."
+msgstr "La instalaciÃ³n fallÃ³. Comprueba la configuraciÃ³n de tu software 
adicional, o lee el log system para entender mejor el problema."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:126
 msgid "Your additional software are installed"
@@ -124,7 +124,7 @@ msgstr "Se ha instalado tu software adicional"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:127
 msgid "Your additional software are ready to use."
-msgstr "Tu software adicional se estÃ¡ usando."
+msgstr "Tu software adicional estÃ¡ listo para usar."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:138
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:157
@@ -136,11 +136,11 @@ msgid ""
 "The check for upgrades failed. This might be due to a network problem. "
 "Please check your network connection, try to restart Tails, or read the "
 "system log to understand better the problem."
-msgstr "FallÃ³, la actualizaciÃ³n. Puede ser por problemas de red. Revisa la 
conexiÃ³n, reinicia Tails, o revisa system log para entender mejor el problema. 
Gracias."
+msgstr "No hemos podido ver si habÃa actualizaciones. Esto puede ser debido a 
un problema de la red. Comprueba tu conexiÃ³n de red, intenta reiniciar Tails, 
o lee el registro ('log') del sistema para comprender mejor el problema."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153
 msgid "Your additional software are up to date"
-msgstr "Se va a actualizar tu software de red."
+msgstr "Tu software adicional estÃ¡ actualizado."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:154
 msgid "The upgrade was successful."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2018-02-21 Thread translation

commit 6e633c9f83bee4d001fb5b02d2705d9fcee96a83
Author: Translation commit bot 
Date:   Wed Feb 21 09:17:11 2018 +

Update translations for tails-misc_completed
---
 es.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/es.po b/es.po
index 411df0a32..4f1469ee7 100644
--- a/es.po
+++ b/es.po
@@ -16,8 +16,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-02-20 11:29+0100\n"
-"PO-Revision-Date: 2018-02-20 19:03+\n"
-"Last-Translator: strel\n"
+"PO-Revision-Date: 2018-02-21 09:16+\n"
+"Last-Translator: Emma Peel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2018-02-21 Thread translation

commit cf7feb7beb7d029d4a8ac85e85811cf067c0e20f
Author: Translation commit bot 
Date:   Wed Feb 21 09:17:05 2018 +

Update translations for tails-misc
---
 es.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/es.po b/es.po
index 411df0a32..4f1469ee7 100644
--- a/es.po
+++ b/es.po
@@ -16,8 +16,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-02-20 11:29+0100\n"
-"PO-Revision-Date: 2018-02-20 19:03+\n"
-"Last-Translator: strel\n"
+"PO-Revision-Date: 2018-02-21 09:16+\n"
+"Last-Translator: Emma Peel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-build/master] Release preparations for 8.0a2

2018-02-21 Thread gk

commit b3fa8c1cf7c9e72c5f647c254a232f38b35b760d
Author: Georg Koppen 
Date:   Wed Feb 21 08:55:35 2018 +

Release preparations for 8.0a2

Changelog update and versions bump
---
 projects/firefox/config|  2 +-
 projects/https-everywhere/config   |  2 +-
 .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 32 ++
 projects/tor-browser/config|  4 +--
 projects/tor-launcher/config   |  2 +-
 projects/tor/config|  2 +-
 projects/torbutton/config  |  2 +-
 rbm.conf   |  6 ++--
 8 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index f19b8ac..b62fce3 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-2-build1'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-2-build2'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 gpg_keyring: torbutton.gpg
diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index ba3f3ca..907e8e1 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2018.1.11
+version: 2018.1.29
 git_url: https://git.torproject.org/https-everywhere.git
 git_hash: '[% c("version") %]'
 git_submodule: 1
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt 
b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index d591af5..3cd0e63 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,35 @@
+Tor Browser 8.0a2 -- February 23 2018
+ * All Platforms
+   * Update Tor to 0.3.3.2-alpha
+   * Update Torbutton to 1.9.9
+ * Bug 24159: Version check does not deal with platform specific checks
+ * Bug 25016: Remove 2017 donation banner
+ * Translations update
+   * Update Tor Launcher to 0.2.15
+ * Bug 25089: Special characters are not escaped in proxy password
+ * Translations update
+   * Update HTTPS Everywhere to 2018.1.29
+   * Update NoScript to 5.1.8.4
+   * Update meek to 0.29
+   * Bug 25215: Revert bug 18619 (we are not disabling IndexedDB any longer)
+   * Bug 19910: Rip out optimistic data socks handshake variant (#3875)
+   * Bug 22659: Changes to `intl.accept.languages` get overwritten after 
restart
+   * Bug 25000: Add [System+Principal] to the NoScript whitelist
+   * Bug 15599: Disable Range requests used by pdfjs as they are not isolated
+   * Bug 22614: Make e10s/non-e10s Tor Browsers indistinguishable
+   * Bug 13575: Disable randomised Firefox HTTP cache decay user tests
+   * Bug 25020: Add a tbb_version.json file
+   * Bug 24995: Include git hash in tor --version
+ * OS X
+   * Bug 22794: Don't open AF_INET/AF_INET6 sockets when AF_LOCAL is configured
+ * Linux
+   * Bug 22794: Don't open AF_INET/AF_INET6 sockets when AF_LOCAL is configured
+ * Windows:
+   * Bug 25266: PT config should include full names of executable files
+ * Build System
+   * Windows
+ * Bug 25111: Don't compile Yasm on our own anymore for Windows Tor Browser
+
 Tor Browser 8.0a1 -- January 23 2018
  * All Platforms
* Update Firefox to 52.6.0esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 7fded62..661b8e2 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -66,9 +66,9 @@ input_files:
 name: snowflake
 enable: '[% c("var/snowflake") %]'
   - filename: Bundle-Data
-  - URL: 
https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-5.1.8.3-fx+sm.xpi
+  - URL: 
https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-5.1.8.4-fx+sm.xpi
 name: noscript
-sha256sum: 9a81de6e26f639e5f82cabddcd361177815c59af2bca6363ba755255feffd2ec
+sha256sum: 1c85a72cd0d7d210f8dd463f9700214703a5f28319c2b1679db00f861a5289f7
   - filename: 'RelativeLink/start-tor-browser.desktop'
 enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index 5f04027..0406800 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.14.3
+version: 0.2.15
 git_url: https://git.torproject.org/tor-launcher.git
 git_hash: '[% c("version") %]'
 gpg_keyring: torbutton.gpg
diff --git a/projects/tor/config b/projects/tor/config
index df721e1..3b805ad 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -1,6 +1,6 @@
 # vim: filetype=yaml

[tor-commits] [tor-launcher/master] Version bump

2018-02-21 Thread gk

commit e61d052217552ab799be49011e9eb076039120de
Author: Georg Koppen 
Date:   Wed Feb 21 08:25:36 2018 +

Version bump
---
 src/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/install.rdf b/src/install.rdf
index 382966c..7e760f8 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -7,7 +7,7 @@
 The Tor Project, Inc.
 Pearl Crescent, LLC
 tor-launc...@torproject.org
-0.2.14.3
+0.2.15
 true
 
https://www.torproject.org/projects/torbrowser.html
 data:text/plain,

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-launcher/master] Translations update

2018-02-21 Thread gk

commit aba8f603837926ab94be2a08b1b9953c5dc3fdac
Author: Georg Koppen 
Date:   Wed Feb 21 08:23:43 2018 +

Translations update
---
 src/chrome/locale/ar/network-settings.dtd   | 22 +++---
 src/chrome/locale/az/network-settings.dtd   |  2 +-
 src/chrome/locale/be/network-settings.dtd   |  2 +-
 src/chrome/locale/bg/torlauncher.properties |  6 ++--
 src/chrome/locale/bn-BD/network-settings.dtd|  2 +-
 src/chrome/locale/bn/network-settings.dtd   |  2 +-
 src/chrome/locale/bo/network-settings.dtd   |  2 +-
 src/chrome/locale/bo/torlauncher.properties |  8 +++---
 src/chrome/locale/br/network-settings.dtd   |  2 +-
 src/chrome/locale/br/torlauncher.properties |  2 +-
 src/chrome/locale/bs/network-settings.dtd   |  2 +-
 src/chrome/locale/cy/network-settings.dtd   |  2 +-
 src/chrome/locale/da/network-settings.dtd   | 12 
 src/chrome/locale/da/torlauncher.properties |  4 +--
 src/chrome/locale/el/network-settings.dtd   |  2 +-
 src/chrome/locale/es-AR/network-settings.dtd|  4 +--
 src/chrome/locale/es-CL/network-settings.dtd|  2 +-
 src/chrome/locale/es-CO/network-settings.dtd|  2 +-
 src/chrome/locale/es-MX/network-settings.dtd|  4 +--
 src/chrome/locale/es/network-settings.dtd   |  4 +--
 src/chrome/locale/eu/network-settings.dtd   |  4 +--
 src/chrome/locale/fa/network-settings.dtd   |  2 +-
 src/chrome/locale/fi/network-settings.dtd   |  5 ++--
 src/chrome/locale/fil/network-settings.dtd  |  2 +-
 src/chrome/locale/fr/network-settings.dtd   | 20 ++---
 src/chrome/locale/fr/torlauncher.properties |  6 ++--
 src/chrome/locale/gl/network-settings.dtd   |  2 +-
 src/chrome/locale/hi/network-settings.dtd   |  4 +--
 src/chrome/locale/hr-HR/network-settings.dtd|  4 +--
 src/chrome/locale/hr/network-settings.dtd   |  6 ++--
 src/chrome/locale/hr/torlauncher.properties |  8 +++---
 src/chrome/locale/hy/network-settings.dtd   |  2 +-
 src/chrome/locale/hy/torlauncher.properties |  4 +--
 src/chrome/locale/id/network-settings.dtd   | 36 +++
 src/chrome/locale/id/torlauncher.properties |  4 +--
 src/chrome/locale/is/network-settings.dtd   | 24 
 src/chrome/locale/is/torlauncher.properties | 14 -
 src/chrome/locale/ja/network-settings.dtd   | 14 -
 src/chrome/locale/ja/torlauncher.properties |  4 +--
 src/chrome/locale/ka/network-settings.dtd   |  2 +-
 src/chrome/locale/kk/network-settings.dtd   |  2 +-
 src/chrome/locale/kk/torlauncher.properties |  6 ++--
 src/chrome/locale/km/network-settings.dtd   |  2 +-
 src/chrome/locale/ko-KR/network-settings.dtd|  2 +-
 src/chrome/locale/ko/network-settings.dtd   |  4 +--
 src/chrome/locale/ky/torlauncher.properties |  2 +-
 src/chrome/locale/lo/network-settings.dtd   |  4 +--
 src/chrome/locale/lt/network-settings.dtd   |  2 +-
 src/chrome/locale/lv/network-settings.dtd   | 38 -
 src/chrome/locale/lv/torlauncher.properties |  4 +--
 src/chrome/locale/mk/network-settings.dtd   | 20 ++---
 src/chrome/locale/mk/torlauncher.properties | 38 -
 src/chrome/locale/ms-MY/torlauncher.properties  | 10 +++
 src/chrome/locale/nb/network-settings.dtd   |  2 +-
 src/chrome/locale/nl-BE/network-settings.dtd|  5 ++--
 src/chrome/locale/nn/network-settings.dtd   |  2 +-
 src/chrome/locale/pa/network-settings.dtd   |  2 +-
 src/chrome/locale/pl/network-settings.dtd   |  6 ++--
 src/chrome/locale/pt/network-settings.dtd   | 12 
 src/chrome/locale/pt/torlauncher.properties | 12 
 src/chrome/locale/si-LK/network-settings.dtd|  2 +-
 src/chrome/locale/sk-SK/network-settings.dtd|  4 +--
 src/chrome/locale/sk/network-settings.dtd   |  2 +-
 src/chrome/locale/sl-SI/network-settings.dtd|  2 +-
 src/chrome/locale/sl/network-settings.dtd   |  2 +-
 src/chrome/locale/sn/torlauncher.properties |  2 +-
 src/chrome/locale/sq/network-settings.dtd   |  4 +--
 src/chrome/locale/sr/network-settings.dtd   |  2 +-
 src/chrome/locale/sr@latin/network-settings.dtd |  2 +-
 src/chrome/locale/ta/network-settings.dtd   |  5 ++--
 src/chrome/locale/tg/network-settings.dtd   |  2 +-
 src/chrome/locale/tg/torlauncher.properties |  6 ++--
 src/chrome/locale/th/network-settings.dtd   |  2 +-
 src/chrome/locale/ti/torlauncher.properties |  6 ++--
 src/chrome/locale/tk/network-settings.dtd   |  2 +-
 src/chrome/locale/tk/torlauncher.properties |  6 ++--
 src/chrome/locale/uk/network-settings.dtd   | 34 +++---
 src/chrome/locale/uk/torlauncher.properties |  4 +--
 src/chrome/locale/ur-PK/network-settings.dtd|  2 +-
 src/chrome/locale/ur/network-settings.dtd   |  6 ++--
 src/chrome/locale/uz/network-settings.dtd   |  2 +-

[tor-commits] [torbutton/master] Release preparations for 1.9.9

2018-02-21 Thread gk

commit d12fc5e19b896830dd08a26fd2883b7c0e81a627
Author: Georg Koppen 
Date:   Wed Feb 21 08:15:56 2018 +

Release preparations for 1.9.9

CHANGELOG update and version bump
---
 src/CHANGELOG   | 5 +
 src/install.rdf | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/CHANGELOG b/src/CHANGELOG
index 79ce7a0..1ad2400 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,8 @@
+1.9.9
+ * Bug 24159: Version check does not deal with platform specific checks
+ * Bug 25016: Remove 2017 donation banner
+ * Translations update
+
 1.9.8.5
  * Bug 21245: Add da translation to Torbutton and keep track of it
  * Bug 24702: Remove Mozilla text from banner
diff --git a/src/install.rdf b/src/install.rdf
index 73e9055..5ecdb6d 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -6,7 +6,7 @@
 Torbutton
 Mike Perry
 torbut...@torproject.org
-1.9.8.5
+1.9.9
 true
 
https://www.torproject.org/projects/torbrowser.html.en
 
chrome://torbutton/content/preferences.xul

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbutton/master] Update translations

2018-02-21 Thread gk

commit 7c55581f80ab138a3cd0f4720d469e8ffddc7959
Author: Georg Koppen 
Date:   Wed Feb 21 08:11:57 2018 +

Update translations
---
 src/chrome/locale/ar/aboutTor.properties  |  8 
 src/chrome/locale/ar/torbutton.dtd|  4 ++--
 src/chrome/locale/da/aboutDialog.dtd  |  4 ++--
 src/chrome/locale/da/aboutTBUpdate.dtd|  4 ++--
 src/chrome/locale/da/aboutTor.dtd | 12 ++--
 src/chrome/locale/da/torbutton.dtd|  8 
 src/chrome/locale/da/torbutton.properties | 20 ++--
 src/chrome/locale/de/torbutton.dtd|  4 ++--
 src/chrome/locale/eu/aboutTor.properties  |  2 +-
 src/chrome/locale/eu/torbutton.dtd|  2 +-
 src/chrome/locale/fa/torbutton.dtd|  2 +-
 src/chrome/locale/fr/aboutTor.dtd | 24 
 src/chrome/locale/fr/aboutTor.properties  |  2 +-
 src/chrome/locale/fr/torbutton.dtd| 24 
 src/chrome/locale/fr/torbutton.properties | 12 ++--
 src/chrome/locale/ja/torbutton.dtd| 30 +++---
 src/chrome/locale/ko/torbutton.dtd|  6 +++---
 src/chrome/locale/pl/torbutton.dtd|  2 +-
 src/chrome/locale/vi/aboutTor.properties  |  2 +-
 src/chrome/locale/vi/torbutton.dtd|  6 +++---
 src/chrome/locale/zh-CN/torbutton.dtd |  2 +-
 21 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/src/chrome/locale/ar/aboutTor.properties 
b/src/chrome/locale/ar/aboutTor.properties
index 8b3d02e..369c257 100644
--- a/src/chrome/locale/ar/aboutTor.properties
+++ b/src/chrome/locale/ar/aboutTor.properties
@@ -11,10 +11,10 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/
 aboutTor.donationBanner.donate=ØªØ¨Ø±Ø¹ Ø§ÙØ¢Ù !
 
 aboutTor.donationBanner.slogan=ØªÙØ± : Ø¯Ø¹Ù Ø§ÙØµÙÙØ¯ Ø§ÙØ±ÙÙÙ
-aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift!
+aboutTor.donationBanner.mozilla=Ø§Ø¹Ø·Ù Ø§ÙÙÙÙ ÙÙÙØ¯Ø²ÙÙØ§ 
Ø³ØªØ±ÙØ¯ ÙÙ Ø§ÙÙØ¯ÙØ©
 
-aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & 
Activists Since 2006
-aboutTor.donationBanner.tagline2=Networking Freedom Worldwide
+aboutTor.donationBanner.tagline1=ØÙØ§ÙØ© Ø§ÙØµØØ§ÙÙÙÙ Ø Ø§ÙÙ
ÙØ®Ø¨Ø±ÙÙ ÙØ§ÙÙÙØ´Ø·Ø§Ø¡ ÙÙØ° Ø¹Ø§Ù 2006
+aboutTor.donationBanner.tagline2=ØØ±ÙØ© Ø§ÙØªÙØ§ØµÙ Ø§ÙØ´Ø¨ÙÙ 
Ø§ÙØ¹Ø§ÙÙÙØ©
 aboutTor.donationBanner.tagline3=Freedom Online
-aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide
+aboutTor.donationBanner.tagline4=ØªØ¹Ø²ÙØ² ØØ±ÙØ© Ø§ÙØªØ¹Ø¨ÙØ± Ø¹Ø§ÙÙ
ÙØ§Ù
 aboutTor.donationBanner.tagline5=ØªØÙÙ Ø®ØµÙØµÙØ© Ø§ÙÙÙØ§ÙÙÙ ÙÙ 
Ø§ÙØ£Ø´Ø®Ø§Øµ ÙÙ ÙÙÙ
diff --git a/src/chrome/locale/ar/torbutton.dtd 
b/src/chrome/locale/ar/torbutton.dtd
index 9e85fcf..6e45989 100644
--- a/src/chrome/locale/ar/torbutton.dtd
+++ b/src/chrome/locale/ar/torbutton.dtd
@@ -33,7 +33,7 @@
 
 
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 
 
 
-
+
 
 
 
diff --git a/src/chrome/locale/da/aboutDialog.dtd 
b/src/chrome/locale/da/aboutDialog.dtd
index ae4278e..eb7a179 100644
--- a/src/chrome/locale/da/aboutDialog.dtd
+++ b/src/chrome/locale/da/aboutDialog.dtd
@@ -5,7 +5,7 @@
 
 
 
-
+
 
 
 
@@ -16,4 +16,4 @@
 
 
 
-
+
diff --git a/src/chrome/locale/da/aboutTBUpdate.dtd 
b/src/chrome/locale/da/aboutTBUpdate.dtd
index f0c6c5a..d0167c7 100644
--- a/src/chrome/locale/da/aboutTBUpdate.dtd
+++ b/src/chrome/locale/da/aboutTBUpdate.dtd
@@ -1,5 +1,5 @@
-
-
+
+
 
 
 
diff --git a/src/chrome/locale/da/aboutTor.dtd 
b/src/chrome/locale/da/aboutTor.dtd
index 23f3f23..6e2679a 100644
--- a/src/chrome/locale/da/aboutTor.dtd
+++ b/src/chrome/locale/da/aboutTor.dtd
@@ -8,9 +8,9 @@
 
 
 
-
+
 
-
+
 
 
 
@@ -26,13 +26,13 @@
 
 
 
-
-
+
+
 https://www.torproject.org/download/download.html.en#warning;>
 
-
+
 
-
+
 
 https://www.torproject.org/docs/tor-doc-relay.html.en;>
 
diff --git a/src/chrome/locale/da/torbutton.dtd 
b/src/chrome/locale/da/torbutton.dtd
index ac93e67..5a82f18 100644
--- a/src/chrome/locale/da/torbutton.dtd
+++ b/src/chrome/locale/da/torbutton.dtd
@@ -4,14 +4,14 @@
 
 
 
-
+
 
-
+
 
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
 
 
 
-
+
 
 
 
diff --git a/src/chrome/locale/da/torbutton.properties 
b/src/chrome/locale/da/torbutton.properties
index d7de66f..54df12c 100644
--- a/src/chrome/locale/da/torbutton.properties
+++ b/src/chrome/locale/da/torbutton.properties
@@ -8,33 +8,33 @@ torbutton.circuit_display.unknown_country = Ukendt land
 torbutton.content_sizer.margin_tooltip = Tor Browser tilfÃ¸jer denne margin 
for at gÃ¸re dit vindues hÃ¸jde og bredde mindre genkendeligt, hvilket 
reducerer muligheden for at andre spore dig online.
 torbutton.panel.tooltip.disabled = Klik for at aktivere Tor
 torbutton.panel.tooltip.enabled = Klik for at deaktivere Tor
-torbutton.panel.label.disabled = Tor Deaktiveret
-torbutton.panel.label.enabled = Tor Aktiveret
+torbutton.panel.label.disabled = Tor deaktiveret
+torbutton.panel.label.enabled = Tor aktiveret

49 matches

Mail list logo