date:20200210

[tor-commits] [tpo/master] Include a changelog link for alpha Tor source releases.

2020-02-10 Thread hiro

commit e0478c6df6ede257b8d163736906d62c23adf1db
Author: Nick Mathewson 
Date:   Mon Feb 10 20:02:22 2020 -0500

Include a changelog link for alpha Tor source releases.

This is all cut-and-paste on my part; I do not claim to actually
know Lektor. ;)
---
 templates/download-tor.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/download-tor.html b/templates/download-tor.html
index 546bf71..c4e689b 100644
--- a/templates/download-tor.html
+++ b/templates/download-tor.html
@@ -18,6 +18,7 @@
 {% set a = bag('versions', 'tor-alpha') %}
 {% set download_link = 'https://dist.torproject.org/tor-' + t.version 
+ '.tar.gz' %}
 {% set changelog_link = 
'https://gitweb.torproject.org/tor.git/plain/ChangeLog?h=tor-' + t.version %}
+{% set alpha_changelog_link = 
'https://gitweb.torproject.org/tor.git/plain/ChangeLog?h=tor-' + a.version %}
 {% set sig_link = download_link + '.asc' %}
 {% set alpha_download_link = 'https://dist.torproject.org/tor-' + 
a.version + '.tar.gz' %}
 {% set alpha_sig_link = alpha_download_link + '.asc' %}
@@ -29,6 +30,7 @@
 {% if t.version != a.version %}
   
 {{ a.version }}
+{{ _('Changelog') 
}}
 {{ 
_('Download') }} ({{ _('sig') }})
   
 {% endif %}

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

[tor-commits] [torspec/master] Prop 312: Clarify IPv6 ORPort Binding

2020-02-10 Thread teor

commit 8af14dea81a2a39be2cb1f76a99a364827ec9d4e
Author: teor 
Date:   Tue Feb 11 14:11:09 2020 +1000

Prop 312: Clarify IPv6 ORPort Binding

Part of 33049.
---
 proposals/312-relay-auto-ipv6-addr.txt | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/proposals/312-relay-auto-ipv6-addr.txt 
b/proposals/312-relay-auto-ipv6-addr.txt
index 98c86c1..ba2ffcc 100644
--- a/proposals/312-relay-auto-ipv6-addr.txt
+++ b/proposals/312-relay-auto-ipv6-addr.txt
@@ -558,6 +558,12 @@ Ticket: #33073
IP address (in a single API call). Tor should support both styles of
networking API.
 
+   In particular, if binding to all IPv6 addresses fails, relays should still
+   try to discover their public IPv6 address, and check the reachability of
+   that address. Some OSes may not support the IPV6_V6ONLY flag, but they may
+   instead bind to all addresses at runtime. (The tor install may also have
+   compile-time / runtime flag mismatches.)
+
If both reachability checks succeed, relays should publish their IPv4 and
IPv6 ORPorts in their descriptor.
 

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

[tor-commits] [torspec/master] Prop 312: Clarify OS hostname API behaviour

2020-02-10 Thread teor

commit e759c0ec4e6433e6d8cb010dda72b92b7477ae5e
Author: teor 
Date:   Tue Feb 11 13:38:17 2020 +1000

Prop 312: Clarify OS hostname API behaviour

Part of 33049.
---
 proposals/312-relay-auto-ipv6-addr.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/proposals/312-relay-auto-ipv6-addr.txt 
b/proposals/312-relay-auto-ipv6-addr.txt
index 659e5a1..98c86c1 100644
--- a/proposals/312-relay-auto-ipv6-addr.txt
+++ b/proposals/312-relay-auto-ipv6-addr.txt
@@ -414,7 +414,8 @@ Ticket: #33073
and IPv6 addresses for:
  * the Address torrc option (see section 3.2.1), and
  * the local hostname.
-   However, OS APIs typically only return a single hostname.
+   However, OS APIs typically only return a single hostname. (Rather than a
+   separate hostname for IPv4 and IPv6.)
 
For security reasons, directory authorities only use addresses that are
explicitly configured in their torrc. Since hostname lookups may use DNS,

___
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 9.5a5

2020-02-10 Thread sysrqb

commit d3059ceb6288874b682076a5bf4aa1dff76511cd
Author: Matthew Finkel 
Date:   Mon Feb 10 01:16:23 2020 +

Release preparations for 9.5a5

Versions bump and Changelog update
---
 projects/firefox-langpacks/config  |  2 +-
 projects/firefox-locale-bundle/config  |  2 +-
 projects/firefox/config|  2 +-
 .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 29 ++
 projects/tor-browser/config|  4 +--
 projects/tor-launcher/config   |  2 +-
 projects/tor/config|  2 +-
 rbm.conf   |  6 ++---
 8 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/projects/firefox-langpacks/config 
b/projects/firefox-langpacks/config
index 34d6fad..17a707a 100644
--- a/projects/firefox-langpacks/config
+++ b/projects/firefox-langpacks/config
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") 
%]-[% c("var/buil
 
 var:
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build1
+  ff_build: build2
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
 targets:
diff --git a/projects/firefox-locale-bundle/config 
b/projects/firefox-locale-bundle/config
index 2f4997f..2ea6db6 100644
--- a/projects/firefox-locale-bundle/config
+++ b/projects/firefox-locale-bundle/config
@@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% 
c("var/build_id") %].tar.gz'
 var:
   use_container: 0
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build1
+  ff_build: build2
diff --git a/projects/firefox/config b/projects/firefox/config
index f780084..845f9c6 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -8,7 +8,7 @@ git_submodule: 1
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 68.4.1
+  firefox_platform_version: 68.5.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 9.5
   branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE 
%]browser[% END %]/branding/alpha'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt 
b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index ad3cc9d..16acbbf 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,32 @@
+Tor Browser 9.5a5 -- February 12 2020
+ * All Platforms
+   * Update Firefox to 68.5.0esr
+   * Bump NoScript to 11.0.13
+   * Translations update
+   * Bug 30237: Control port module improvements for v3 client authentication
+   * Bug 32891: Add new default bridges
+   * Bug 31395: Remove inline script in aboutTor.xhtml
+   * Bug 27268: Preferences clean-up in Torbutton code
+   * Bug 32470: Backport fix for bug 1590538
+   * Bug 32414: Make Services.search.addEngine obey FPI
+   * Bug 32948: Make referer behavior consistent regardless of private browing 
mode status
+   * Bug 461204: Improve the random number generator for the boundaries in 
multipart/form-data
+ * Android
+   * Bug 30767: Custom obfs4 bridge does not work on Tor Browser for Android
+ * Windows + OS X + Linux
+   * Update Tor to 0.4.3.1-alpha
+   * Update Tor Launcher to 0.2.21.1
+ * Translations update
+ * Bug 30237: Add v3 onion services client authentication prompt
+ * Bug 32870: Update version of pion-webrtc
+   * Bug 32767: Remove Disconnect search
+   * Bug 30237: Add v3 onion services client authentication prompt
+ * Build System
+   * Linux
+ * Bug 32976: Build and bundle geckodriver
+   * OS X
+ * Bug 33200: Fix permissions on bookmarks.html
+
 Tor Browser 9.5a4 -- January 10 2020
  * All Platforms
* Update Firefox to 68.4.1esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index d3e8e61..7fd61a9 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -74,9 +74,9 @@ input_files:
 enable: '[% c("var/snowflake") %]'
   - filename: Bundle-Data
 enable: '[% ! c("var/android") %]'
-  - URL: 
https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.11-an+fx.xpi
+  - URL: 
https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.13-an+fx.xpi
 name: noscript
-sha256sum: 1b0daa12e1b8fbc8e30e7bdb5689b12774aaa9f883cb3e9ad57943a883ce65b5
+sha256sum: ced718d9d9e719547db392ad85d24a7ad5c6b54cc0f93f9c57f2fcb44bb4de56
   - 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 874ad15..fec0612 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.21
+version: 0.2.21.1
 git_url: https://git.torproject.org/tor-launcher.git
 git_hash: '[% c("version") %]'
 gpg_keyring: torbutton.gpg

[tor-commits] [tor-browser-build/master] Bug 30767: Support custom PT bridges on Android

2020-02-10 Thread sysrqb

commit 3ce57ded27baa63dfff074e9a10a62365dc3bc25
Author: Matthew Finkel 
Date:   Fri Feb 7 02:18:21 2020 +

Bug 30767: Support custom PT bridges on Android
---
 ...ustom-obfs4-bridge-does-not-work-on-Tor-B.patch | 146 +
 projects/tor-onion-proxy-library/build |   1 +
 projects/tor-onion-proxy-library/config|   1 +
 3 files changed, 148 insertions(+)

diff --git 
a/projects/tor-onion-proxy-library/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch
 
b/projects/tor-onion-proxy-library/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch
new file mode 100644
index 000..2d1bc51
--- /dev/null
+++ 
b/projects/tor-onion-proxy-library/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch
@@ -0,0 +1,146 @@
+From 0a482a749fd770827d3d6c71debb112a07e7fae3 Mon Sep 17 00:00:00 2001
+From: sisbell 
+Date: Thu, 14 Nov 2019 13:43:09 -0800
+Subject: [PATCH] Bug 30767: Custom obfs4 bridge does not work on Tor Browser
+ for Android
+
+TOPL fixes #134
+---
+ .../thali/toronionproxy/TorConfigBuilder.java | 63 ---
+ 1 file changed, 26 insertions(+), 37 deletions(-)
+
+diff --git 
a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java
 
b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java
+index e324d9f..da9a6a2 100644
+--- 
a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java
 
b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java
+@@ -99,25 +99,32 @@ public final class TorConfigBuilder {
+ return this;
+ }
+ 
++@SettingsConfig
++public TorConfigBuilder bridgesFromSettings() {
++try {
++addBridgesFromResources();
++} catch (IOException e) {
++e.printStackTrace();
++}
++return this;
++}
++
+ public TorConfigBuilder configurePluggableTransportsFromSettings(File 
pluggableTransportClient) throws IOException {
+-List supportedBridges = settings.getListOfSupportedBridges();
+-if (pluggableTransportClient == null || !settings.hasBridges() || 
supportedBridges.size() < 1) {
++if (pluggableTransportClient == null) {
+ return this;
+ }
+ 
+-if (!pluggableTransportClient.exists() || 
!pluggableTransportClient.canExecute()) {
++if (!pluggableTransportClient.exists()) {
+ throw new IOException("Bridge binary does not exist: " + 
pluggableTransportClient
+ .getCanonicalPath());
+ }
+ 
+-if (supportedBridges.contains("obfs3") || 
supportedBridges.contains("obfs4")) {
+-transportPluginObfs(pluggableTransportClient.getCanonicalPath());
+-}
+-if (supportedBridges.contains("meek")) {
+-transportPluginMeek(pluggableTransportClient.getCanonicalPath());
++if (!pluggableTransportClient.canExecute()) {
++throw new IOException("Bridge binary is not executable: " + 
pluggableTransportClient
++.getCanonicalPath());
+ }
+-String type = supportedBridges.contains("meek") ? "meek_lite" : 
"obfs4";
+-addBridgesFromResources(type, 2);
++
++transportPlugin(pluggableTransportClient.getCanonicalPath());
+ return this;
+ }
+ 
+@@ -471,14 +478,8 @@ public final class TorConfigBuilder {
+ return transPort(settings.transPort());
+ }
+ 
+-public TorConfigBuilder transportPluginMeek(String clientPath) {
+-buffer.append("ClientTransportPlugin meek_lite exec 
").append(clientPath).append('\n');
+-return this;
+-}
+-
+-public TorConfigBuilder transportPluginObfs(String clientPath) {
+-buffer.append("ClientTransportPlugin obfs3 exec 
").append(clientPath).append('\n');
+-buffer.append("ClientTransportPlugin obfs4 exec 
").append(clientPath).append('\n');
++public TorConfigBuilder transportPlugin(String clientPath) {
++buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec 
").append(clientPath).append('\n');
+ return this;
+ }
+ 
+@@ -489,7 +490,7 @@ public final class TorConfigBuilder {
+ 
+ @SettingsConfig
+ public TorConfigBuilder useBridgesFromSettings() {
+-return !settings.hasBridges() ? dontUseBridges() : this;
++return settings.hasBridges() ? useBridges() : this;
+ }
+ 
+ public TorConfigBuilder virtualAddressNetwork(String address) {
+@@ -518,12 +519,12 @@ public final class TorConfigBuilder {
+  * 
+  *
+  */
+-TorConfigBuilder addBridgesFromResources(String type, int maxBridges) 
throws IOException {
++TorConfigBuilder addBridgesFromResources() throws IOException {
+ if(settings.hasBridges()) {
+ InputStream bridgesStream = 
context.getInstaller().openBridgesStream();
+ int formatType = bridgesStream.read();
+-if(formatType == 0) {
+-

[tor-commits] [tor-browser-build/master] Bug 33200: Fix permissions on bookmarks.html

2020-02-10 Thread sysrqb

commit 241e805dbbefcb0860bf32a38b63fcd7edf71a68
Author: Nicolas Vigier 
Date:   Sun Feb 9 23:50:01 2020 +0100

Bug 33200: Fix permissions on bookmarks.html

Fix a build reproducibility issue caused by different permissions on
bookmarks.html.
---
 projects/tor-browser/build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index 2633ddc..b9732e8 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -170,6 +170,7 @@ cp defaults/preferences/000-tor-browser.js $rootdir
   mkdir -p chrome/en-US/locale/browser
   cp -p $rootdir/bookmarks.html chrome/en-US/locale/browser/
   [% c("var/touch") %] chrome/en-US/locale/browser/bookmarks.html
+  chmod 600 chrome/en-US/locale/browser/bookmarks.html
   zip -Xm omni.ja chrome/en-US/locale/browser/bookmarks.html
   rm -rf chrome
 [% END %]



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

[tor-commits] [torspec/master] Prop 313: Update IPv6 Connection Stats

2020-02-10 Thread teor

commit e31ded5bd7769fd86c488b678a74fe877a0fa50c
Author: teor 
Date:   Tue Feb 11 09:09:31 2020 +1000

Prop 313: Update IPv6 Connection Stats

We currently have enough relays reporting connection stats,
but these reports might be a bug.

Make the ConnDirectionStatistics consensus paramter into an
optional change, depending on the outcome of the bug.

Part of 33159.
---
 proposals/313-relay-ipv6-stats.txt | 51 --
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/proposals/313-relay-ipv6-stats.txt 
b/proposals/313-relay-ipv6-stats.txt
index 7da142a..74c1780 100644
--- a/proposals/313-relay-ipv6-stats.txt
+++ b/proposals/313-relay-ipv6-stats.txt
@@ -143,7 +143,10 @@ Ticket: #33159
 
 5. Collecting IPv6 Connection Statistics
 
-   We propose that relays (and bridges) collect IPv6 connection statistics.
+   We propose that relays (but not bridges) collect IPv6 connection statistics.
+
+   Bridges refuse to collect the existing ConnDirectionStatistics, so we do not
+   believe it is safe to collect the smaller IPv6 totals on bridges.
 
To minimise development and testing effort, we propose re-using the existing
"bidi" code in rephist.c. (This code may require some refactoring, because
@@ -159,23 +162,8 @@ Ticket: #33159
statistics can be calculated by subtracting the IPv6 statistics from the
existing total connection statistics.)
 
-   We propose using the existing ConnDirectionStatistics torrc option, and
-   adding a consensus parameter with the same name. This option will control
-   the new and existing connection statistics.
-
-   The default value of this option should be "auto", which checks the
-   consensus parameter. If there is no consensus parameter, the default should
-   be 0. (The existing connection direction statistics are reported by
-   default.)
-
-   TODO: Do enough relays report ConnDirectionStatistics, for accurate IPv6
-   connection statistics?
- * at least 25% of relays have IPv6
- * at the end of the project, we expect at least 33% of relays to have
-   deployed tor 0.4.4-stable
-
-   If not, we should turn on ConnDirectionStatistics by default. (Or set the
-   consensus parameter for a few days, to collect these statistics.)
+   See also section 7.6, which adds a ConnDirectionStatistics consensus
+   parameter. This consensus paramter is an optional change.
 
 6. Directory Protocol Specification Changes
 
@@ -319,6 +307,30 @@ Ticket: #33159
consensus parameter. If there is no consensus parameter, the default should
be 1. (The existing bandwidth statistics are reported by default.)
 
+7.6. Add a ConnDirectionStatistics consensus parameter
+
+   We propose using the existing ConnDirectionStatistics torrc option, and
+   adding a consensus parameter with the same name. This option will control
+   the new and existing connection statistics.
+
+   The default value of this option should be "auto", which checks the
+   consensus parameter. If there is no consensus parameter, the default should
+   be 0.
+
+   Bridges refuse to collect the existing ConnDirectionStatistics, so we do not
+   believe it is safe to collect the smaller IPv6 totals on bridges. The new
+   consensus parameter should also be ignored on bridges.
+
+   The existing connection direction statistics are not reported by default,
+   but almost all relays actually report them. For more details, see:
+   [Ticket 33214: ConnDirectionStatistics is off by default, but most relays
+   report it].
+
+   If we fix the ConnDirectionStatistics default in Tor 0.4.4, we should also
+   implement the ConnDirectionStatistics consensus parameter. Then we can set
+   the consensus parameter to 1 for a week or two, so we can collect these
+   statistics.
+
 8. Test Plan
 
We provide a quick summary of our testing plans.
@@ -380,6 +392,9 @@ References:
 [Relay Search]:
https://metrics.torproject.org/rs.html
 
+[Ticket 33214: ConnDirectionStatistics is off by default, but most relays 
report it]:
+   https://trac.torproject.org/projects/tor/ticket/12377
+
 [Tor Directory Protocol]:
(version 3) https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt
 



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

[tor-commits] [torspec/master] Prop 313: Only Script, No Tor Logs

2020-02-10 Thread teor

commit 91356f5db02b6a62afa3061278872b8d607db7ea
Author: teor 
Date:   Tue Feb 11 08:32:25 2020 +1000

Prop 313: Only Script, No Tor Logs

Remove the tor logs from the proposal, only write a script.
(Some of these calculations are medium-term, and are most relevent
during Sponsor 55.)

Part of 33159.
---
 proposals/313-relay-ipv6-stats.txt | 87 +++---
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/proposals/313-relay-ipv6-stats.txt 
b/proposals/313-relay-ipv6-stats.txt
index b521e9b..e615afe 100644
--- a/proposals/313-relay-ipv6-stats.txt
+++ b/proposals/313-relay-ipv6-stats.txt
@@ -7,13 +7,19 @@ Ticket: #33159
 
 0. Abstract
 
-   We propose that Tor relays (and bridges) should log the number of relays in
-   the consensus that support IPv6 extends, and IPv6 client connections.
-
-   We also propose that Tor relays (and bridges) should collect statistics on
-   IPv6 connections and consumed bandwidth. Like tor's existing connection
-   and consumed bandwidth statistics, these new IPv6 statistics will be
-   published in each relay's extra-info descriptor.
+   We propose that:
+ * tor relays should collect statistics on IPv6 connections, and
+ * tor relays and bridges should collect statistics on consumed bandwidth.
+   Like tor's existing connection and consumed bandwidth statistics, these new
+   IPv6 statistics will be published in each relay's extra-info descriptor.
+
+   We also plan to write a script that shows the number of relays in the
+   consensus that support:
+ * IPv6 extends, and
+ * IPv6 client connections.
+   This script will be used for medium-term monitoring, during the deployment
+   of tor's IPv6 changes in 2020. (See [Proposal 311: Relay IPv6 Reachability]
+   and [Proposal 312: Relay Auto IPv6 Address].)
 
 1. Introduction
 
@@ -35,12 +41,6 @@ Ticket: #33159
 
This proposal modifies Tor's behaviour as follows:
 
-   Relays, bridges, and directory authorities log the number of relays that
-   support IPv6 clients, and IPv6 relay reachability checks. They also log the
-   corresponding consensus weight fractions.
-
-   As an optional change, tor clients may also log this information.
-
Relays, bridges, and directory authorities collect statistics on:
  * IPv6 connections, and
  * IPv6 consumed bandwidth.
@@ -69,31 +69,31 @@ Ticket: #33159
in each section should specifically exclude or include these other roles.)
 
Tor clients do not collect any statistics for public reporting. Therefore,
-   clients are out of scope in this proposal. (Except for some optional changes
-   to client logs, where they log the number of IPv6 relays in the consensus).
+   clients are out of scope in this proposal.
 
When this proposal describes Tor's current behaviour, it covers all
supported Tor versions (0.3.5.7 to 0.4.2.5), as of January 2020, except
where another version is specifically mentioned.
 
-3. Logging IPv6 Relays in the Consensus
+   This proposal also includes a medium-term monitoring script, which
+   calculates the number of relays in the consensus that support IPv6 extends,
+   and IPv6 client connections.
+
+3. Monitoring IPv6 Relays in the Consensus
 
-   We propose that relays (and bridges) log:
+   We propose writing a script that calculates:
  * the number of relays, and
  * the consensus weight fraction of relays,
in the consensus that:
  * have an IPv6 ORPort,
- * support IPv6 reachability checks, and
- * support IPv6 clients.
-
-   In order to test these changes, and provide easy access to these
-   statistics, we propose implementing a script that:
- * downloads a consensus, and
- * calculates and reports these statistics.
+ * support IPv6 reachability checks,
+ * support IPv6 clients, and
+ * support IPv6 reachability checks, and IPv6 clients.
 
-   As well as the statistics listed above, this script should also report the
-   following relay statistic:
- * support IPv6 reachability checks and IPv6 clients.
+   In order to provide easy access to these statistics, we propose
+   that the script should:
+ * download a consensus (or read an existing consensus), and
+ * calculate and report these statistics.
 
The following consensus weight fractions should divide by the total
consensus weight:
@@ -108,13 +108,12 @@ Ticket: #33159
"Usable Guards" have the Guard flag, but do not have the Exit flag. If the
Guard also has the BadExit flag, the Exit flag should be ignored.
 
-   We propose that these logs happen whenever tor:
- * receives a consensus from a directory server, or
- * loads a live, valid, cached consensus from disk.
+   Note that this definition of "Usable Guards" is only valid when the
+   consensus contains many more guards than exits. That is, Wgd must be 0 in
+   the consensus. (See the [Tor Directory Protocol] for more details.)
 
-   As an optional change, tor

[tor-commits] [torspec/master] Prop 311 & 312: Some changes affect IPv6 stats

2020-02-10 Thread teor

commit 01105c25434a7ead121d7f37adbb3a5afcd4f8a1
Author: teor 
Date:   Mon Feb 10 12:45:49 2020 +1000

Prop 311 & 312: Some changes affect IPv6 stats

When a change increases an IPv6 statistic, mention the impact in
proposals 311 and 312.

Related to proposal 313, which covers IPv6 statistics.

Part of 33159.
---
 proposals/311-relay-ipv6-reachability.txt | 6 ++
 proposals/312-relay-auto-ipv6-addr.txt| 5 +
 2 files changed, 11 insertions(+)

diff --git a/proposals/311-relay-ipv6-reachability.txt 
b/proposals/311-relay-ipv6-reachability.txt
index 85f089a..978dc9b 100644
--- a/proposals/311-relay-ipv6-reachability.txt
+++ b/proposals/311-relay-ipv6-reachability.txt
@@ -294,6 +294,12 @@ Ticket: #24404
The testing relay will confirm that test circuits can extend to both its
IPv4 and IPv6 ORPorts.
 
+   Checking IPv6 ORPort reachability will create extra IPv6 connections on the
+   tor network. (See [Proposal 313: Relay IPv6 Statistics].) It won't directly
+   create much extra traffic, because reachability circuits don't send many
+   cells. But some client circuits may use the IPv6 connections created by
+   relay reachability self-tests.
+
 4.2.1. Selecting the Final Extending Relay
 
IPv6 ORPort reachability checks require an IPv6 extend-capable relay as
diff --git a/proposals/312-relay-auto-ipv6-addr.txt 
b/proposals/312-relay-auto-ipv6-addr.txt
index 08fbcde..8914cb7 100644
--- a/proposals/312-relay-auto-ipv6-addr.txt
+++ b/proposals/312-relay-auto-ipv6-addr.txt
@@ -487,6 +487,11 @@ Ticket: #33073
IPv6 address, tor should use that address for reachability checks. If the
reachability checks succeed, tor should use that address in its descriptor.
 
+   Doing relay directory fetches over IPv6 will create extra IPv6 connections
+   and IPv6 bandwidth on the tor network. (See
+   [Proposal 313: Relay IPv6 Statistics].) In addition, some client circuits
+   may use the IPv6 connections created by relay directory fetches.
+
 3.2.6. Disabling IPv6 Address Resolution
 
Relays (and bridges) that have a reachable IPv6 address, but that address



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

[tor-commits] [torspec/master] Prop 313: Add IPv6 bandwidth statistics safety

2020-02-10 Thread teor

commit e9a888f01ad86e8a9193de16ae956c8a62f3c6ae
Author: teor 
Date:   Tue Feb 11 08:51:47 2020 +1000

Prop 313: Add IPv6 bandwidth statistics safety

Also make BandwidthStatistics an optional change.

Part of 33159.
---
 proposals/313-relay-ipv6-stats.txt | 30 --
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/proposals/313-relay-ipv6-stats.txt 
b/proposals/313-relay-ipv6-stats.txt
index e615afe..7da142a 100644
--- a/proposals/313-relay-ipv6-stats.txt
+++ b/proposals/313-relay-ipv6-stats.txt
@@ -1,6 +1,6 @@
 Filename: 313-relay-ipv6-stats.txt
 Title: Tor Relay IPv6 Statistics
-Author: teor
+Author: teor, Karsten Loesing, Nick Mathewson
 Created: 10-February-2020
 Status: Draft
 Ticket: #33159
@@ -135,20 +135,11 @@ Ticket: #33159
(The IPv4 statistics can be calculated by subtracting the IPv6 statistics
from the existing total consumed bandwidth statistics.)
 
-   We propose adding a new BandwidthStatistics torrc option and consensus
-   parameter, which activates reporting of all these statistics. Currently,
-   the existing statistics are controlled by ExtraInfoStatistics, but we
-   propose using the new BandwidthStatistics option for them as well.
-
-   The default value of this option should be "auto", which checks the
-   consensus parameter. If there is no consensus parameter, the default should
-   be 1. (The existing bandwidth statistics are reported by default.)
+   We believe that collecting IPv6 consumed bandwidth statistics is about as
+   safe as the existing IPv4+IPv6 total consumed bandwidth statistics.
 
-   TODO: Should we collect IPv6 bandwidth statistics on bridges?
- On bridges, should bandwidth statistics be on or off by default?
-
- If we do want to collect bridge statistics, and we think it's safe,
- modify proposals 311 and 312 to allow bridge statistics.
+   See also section 7.5, which adds a BandwidthStatistics torrc option and
+   consensus parameter. BandwidthStatistics is an optional change.
 
 5. Collecting IPv6 Connection Statistics
 
@@ -317,6 +308,17 @@ Ticket: #33159
  * as a stacked graph, like
[Tor Metrics: Advertised and consumed bandwidth by relay flags]
 
+7.5. Add a BandwidthStatistics option
+
+   We propose adding a new BandwidthStatistics torrc option and consensus
+   parameter, which activates reporting of all these statistics. Currently,
+   the existing statistics are controlled by ExtraInfoStatistics, but we
+   propose using the new BandwidthStatistics option for them as well.
+
+   The default value of this option should be "auto", which checks the
+   consensus parameter. If there is no consensus parameter, the default should
+   be 1. (The existing bandwidth statistics are reported by default.)
+
 8. Test Plan
 
We provide a quick summary of our testing plans.



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

[tor-commits] [torspec/master] Prop 312: Clarify IPv6 Directory Failures

2020-02-10 Thread teor

commit aa53246772db5c0246ac71fb5c97acfac5854318
Author: teor 
Date:   Mon Feb 10 12:49:43 2020 +1000

Prop 312: Clarify IPv6 Directory Failures

Part of 33073.
---
 proposals/312-relay-auto-ipv6-addr.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/proposals/312-relay-auto-ipv6-addr.txt 
b/proposals/312-relay-auto-ipv6-addr.txt
index 8914cb7..c384d4c 100644
--- a/proposals/312-relay-auto-ipv6-addr.txt
+++ b/proposals/312-relay-auto-ipv6-addr.txt
@@ -465,7 +465,9 @@ Ticket: #33073
  * explicitly configured with an IPv6 address, or
  * a publicly routable, reachable IPv6 address is discovered in an
earlier step,
-   tor should start issuing IPv6 directory failure logs at warning level.
+   tor should start issuing IPv6 directory failure logs at warning level. Tor
+   may also record these directory failures as remote relay failures. (Rather
+   than ignoring them, as described in the previous paragraph.)
 
(Alternately, tor could stop doing IPv6 directory requests entirely. But we
prefer designs where all relays behave in a similar way, regardless of their



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

[tor-commits] [torspec/master] Prop 311 & 312: Update monitoring based on 313

2020-02-10 Thread teor

commit a0492dd33cfc9d210fd9a4f762b779f452591668
Author: teor 
Date:   Tue Feb 11 08:53:14 2020 +1000

Prop 311 & 312: Update monitoring based on 313

Keep the monitoring summaries in proposals 311 and 312 in sync with
proposal 313.

Part of 33159.
---
 proposals/311-relay-ipv6-reachability.txt | 16 
 proposals/312-relay-auto-ipv6-addr.txt| 20 +---
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/proposals/311-relay-ipv6-reachability.txt 
b/proposals/311-relay-ipv6-reachability.txt
index 9f536d3..fd131e1 100644
--- a/proposals/311-relay-ipv6-reachability.txt
+++ b/proposals/311-relay-ipv6-reachability.txt
@@ -731,23 +731,23 @@ Ticket: #24404
 
 7. Ongoing Monitoring
 
-   To monitor the impact of these changes, relays should collect basic IPv4
-   and IPv6 connection and bandwidth statistics (see [Proposal 313: Relay IPv6
-   Statistics]).
-
-   We may also collect separate statistics on connections from:
- * clients (and bridges, because they act like clients), and
- * other relays (and authorities, because they act like relays).
+   To monitor the impact of these changes:
+ * relays should collect basic IPv6 connection statistics, and
+ * relays and bridges should collect basic IPv6 bandwidth statistics.
+   (See [Proposal 313: Relay IPv6 Statistics]).
 
Some of these statistics may be included in tor's heartbeat logs, making
them accessible to relay operators.
 
We do not propose to collect additional statistics on:
- * bridges,
  * circuit counts, or
  * failure rates.
Collecting statistics like these could impact user privacy.
 
+   We also plan to write a script to calculate the number of IPv6 relays in
+   the consensus. This script will help us monitor the network during the
+   deployment of these new IPv6 features.
+
 8. Changes to Other Proposals
 
[Proposal 306: Client Auto IPv6 Connections] needs to be modified to keep
diff --git a/proposals/312-relay-auto-ipv6-addr.txt 
b/proposals/312-relay-auto-ipv6-addr.txt
index 5228c6c..659e5a1 100644
--- a/proposals/312-relay-auto-ipv6-addr.txt
+++ b/proposals/312-relay-auto-ipv6-addr.txt
@@ -1479,24 +1479,22 @@ Ticket: #33073
 
 6. Ongoing Monitoring
 
-   To monitor the impact of these changes, relays should collect basic IPv4
-   and IPv6 connection and bandwidth statistics (see [Proposal 313: Relay IPv6
-   Statistics]).
-
-   We may also collect separate statistics on connections from:
- * clients (and bridges, because they act like clients), and
- * other relays (and authorities, because they act like relays).
+   To monitor the impact of these changes:
+ * relays should collect basic IPv6 connection statistics, and
+ * relays and bridges should collect basic IPv6 bandwidth statistics.
+   (See [Proposal 313: Relay IPv6 Statistics]).
 
Some of these statistics may be included in tor's heartbeat logs, making
them accessible to relay operators.
 
We do not propose to collect additional statistics on:
- * bridges,
- * address resolution,
  * circuit counts, or
  * failure rates.
-   Collecting statistics like these could impact user privacy, or relay
-   security.
+   Collecting statistics like these could impact user privacy.
+
+   We also plan to write a script to calculate the number of IPv6 relays in
+   the consensus. This script will help us monitor the network during the
+   deployment of these new IPv6 features.
 
 7. Changes to Other Proposals
 



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

[tor-commits] [torspec/master] Prop 313: Fix title

2020-02-10 Thread teor

commit 64c2ef85c50afa3c890d773ff00c64733ab38029
Author: teor 
Date:   Mon Feb 10 16:58:29 2020 +1000

Prop 313: Fix title

Part of 33159.
---
 proposals/313-relay-ipv6-stats.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proposals/313-relay-ipv6-stats.txt 
b/proposals/313-relay-ipv6-stats.txt
index 2452918..b521e9b 100644
--- a/proposals/313-relay-ipv6-stats.txt
+++ b/proposals/313-relay-ipv6-stats.txt
@@ -1,5 +1,5 @@
 Filename: 313-relay-ipv6-stats.txt
-Title: Relay IPv6 Statistics
+Title: Tor Relay IPv6 Statistics
 Author: teor
 Created: 10-February-2020
 Status: Draft



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

[tor-commits] [torspec/master] Prop 313: Relay IPv6 Statistics - Initial Draft

2020-02-10 Thread teor

commit 27de9d175b363f2ea744692d705319be06aed3f0
Author: teor 
Date:   Mon Feb 10 16:11:14 2020 +1000

Prop 313: Relay IPv6 Statistics - Initial Draft

Related to tickets: 33159 (proposal), 33051 and 33052 (implementation).
---
 proposals/313-relay-ipv6-stats.txt | 399 +
 1 file changed, 399 insertions(+)

diff --git a/proposals/313-relay-ipv6-stats.txt 
b/proposals/313-relay-ipv6-stats.txt
new file mode 100644
index 000..2452918
--- /dev/null
+++ b/proposals/313-relay-ipv6-stats.txt
@@ -0,0 +1,399 @@
+Filename: 313-relay-ipv6-stats.txt
+Title: Relay IPv6 Statistics
+Author: teor
+Created: 10-February-2020
+Status: Draft
+Ticket: #33159
+
+0. Abstract
+
+   We propose that Tor relays (and bridges) should log the number of relays in
+   the consensus that support IPv6 extends, and IPv6 client connections.
+
+   We also propose that Tor relays (and bridges) should collect statistics on
+   IPv6 connections and consumed bandwidth. Like tor's existing connection
+   and consumed bandwidth statistics, these new IPv6 statistics will be
+   published in each relay's extra-info descriptor.
+
+1. Introduction
+
+   Tor relays (and bridges) can accept IPv6 client connections via their
+   ORPort. But current versions of tor need to have an explicitly configured
+   IPv6 address (see [Proposal 312: Relay Auto IPv6 Address]), and they don't
+   perform IPv6 reachability self-checks (see
+   [Proposal 311: Relay IPv6 Reachability]).
+
+   As we implement these new IPv6 features in tor, we want to monitor their
+   impact on the IPv6 connections and bandwidth in the tor network.
+
+   Tor developers also need to know how many relays support these new IPv6
+   features, so they can test tor's IPv6 reachability checks. (In particular,
+   see section 4.3.1 in [Proposal 311: Relay IPv6 Reachability]:  Refusing to
+   Publish the Descriptor.)
+
+2. Scope
+
+   This proposal modifies Tor's behaviour as follows:
+
+   Relays, bridges, and directory authorities log the number of relays that
+   support IPv6 clients, and IPv6 relay reachability checks. They also log the
+   corresponding consensus weight fractions.
+
+   As an optional change, tor clients may also log this information.
+
+   Relays, bridges, and directory authorities collect statistics on:
+ * IPv6 connections, and
+ * IPv6 consumed bandwidth.
+   The design of these statistics will be based on tor's existing connection
+   and consumed bandwidth statistics.
+
+   Tor's existing consumed bandwidth statistics truncate their totals to the
+   nearest kilobyte. The existing connection statistics do not perform any
+   binning.
+
+   We do not proposed to add any extra noise or binning to these statistics.
+   Instead, we expect to leave these changes until we have a consistent
+   privacy-preserving statistics framwework for tor. As an example of this
+   kind of framework, see
+   [Proposal 288: Privacy-Preserving Stats with Privcount (Shamir version)].
+
+   We avoid:
+ * splitting connection statistics into clients and relays, and
+ * collecting circuit statistics.
+   These statistics are more sensitive, so we want to implement
+   privacy-preserving statistics, before we consider adding them.
+
+   Throughout this proposal, "relays" includes directory authorities, except
+   where they are specifically excluded. "relays" does not include bridges,
+   except where they are specifically included. (The first mention of "relays"
+   in each section should specifically exclude or include these other roles.)
+
+   Tor clients do not collect any statistics for public reporting. Therefore,
+   clients are out of scope in this proposal. (Except for some optional changes
+   to client logs, where they log the number of IPv6 relays in the consensus).
+
+   When this proposal describes Tor's current behaviour, it covers all
+   supported Tor versions (0.3.5.7 to 0.4.2.5), as of January 2020, except
+   where another version is specifically mentioned.
+
+3. Logging IPv6 Relays in the Consensus
+
+   We propose that relays (and bridges) log:
+ * the number of relays, and
+ * the consensus weight fraction of relays,
+   in the consensus that:
+ * have an IPv6 ORPort,
+ * support IPv6 reachability checks, and
+ * support IPv6 clients.
+
+   In order to test these changes, and provide easy access to these
+   statistics, we propose implementing a script that:
+ * downloads a consensus, and
+ * calculates and reports these statistics.
+
+   As well as the statistics listed above, this script should also report the
+   following relay statistic:
+ * support IPv6 reachability checks and IPv6 clients.
+
+   The following consensus weight fractions should divide by the total
+   consensus weight:
+ * have an IPv6 ORPort (all relays have an IPv4 ORPort), and
+ * support IPv6 reachability checks (all relays support IPv4 reachability).
+
+   The following consensus weight

[tor-commits] [torspec/master] Prop 311: Add Optional IPv6 Bandwidth Self-Tests

2020-02-10 Thread teor

commit 58000de4faea96761d9e87dcd7cb1fcef63e961e
Author: teor 
Date:   Mon Feb 10 12:46:12 2020 +1000

Prop 311: Add Optional IPv6 Bandwidth Self-Tests

Add an optional change that makes relays do bandwidth self-tests over
IPv6.

This change increases the connection and bandwidth IPv6 statistics.
Related to proposal 313, which covers IPv6 statistics.

Related to 33159.
---
 proposals/311-relay-ipv6-reachability.txt | 21 +
 1 file changed, 21 insertions(+)

diff --git a/proposals/311-relay-ipv6-reachability.txt 
b/proposals/311-relay-ipv6-reachability.txt
index 978dc9b..e4c9414 100644
--- a/proposals/311-relay-ipv6-reachability.txt
+++ b/proposals/311-relay-ipv6-reachability.txt
@@ -573,6 +573,27 @@ Ticket: #24404
network makes it more likely that an existing connection can be used for
the final hop of a relay IPv6 ORPort reachability check.
 
+4.4.5. Relay Bandwidth Self-Tests Over IPv4 and IPv6
+
+   In this proposal, we only make relays (and bridges) use IPv6 for their
+   reachability self-tests.
+
+   We propose this optional change, to improve the accuracy of relay (and
+   bridge) bandwidth self-tests:
+
+   Relays (and bridges) perform bandwidth self-tests over IPv4 and IPv6.
+
+   If we implement good abstractions for relay self-tests, then this change
+   will not need much extra code.
+
+   If we implement IPv6 extends for all relay circuits (see section 4.4.4),
+   then this change will effectively be redundant.
+
+   Doing relay bandwidth self-tests over IPv6 will create extra IPv6
+   connections and IPv6 bandwidth on the tor network. (See
+   [Proposal 313: Relay IPv6 Statistics].) In addition, some client circuits
+   may use the IPv6 connections created by relay bandwidth self-tests.
+
 4.5. Alternate Reachability Designs
 
We briefly mention some potential reachability designs, and the reasons that



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

[tor-commits] [torspec/master] Proposals: Run reindex.py

2020-02-10 Thread teor

commit 8cc8bff1063126bfc5bc9604115230acc7942895
Author: teor 
Date:   Tue Feb 11 11:58:01 2020 +1000

Proposals: Run reindex.py
---
 proposals/000-index.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index 2e01c99..7706b2a 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -233,6 +233,7 @@ Proposals by number:
 310  Towards load-balancing in Prop 271 [OPEN]
 311  Tor Relay IPv6 Reachability [DRAFT]
 312  Tor Relay Automatic IPv6 Address Discovery [DRAFT]
+313  Tor Relay IPv6 Statistics [DRAFT]
 
 
 Proposals by status:
@@ -248,6 +249,7 @@ Proposals by status:
309  Optimistic SOCKS Data
311  Tor Relay IPv6 Reachability
312  Tor Relay Automatic IPv6 Address Discovery
+   313  Tor Relay IPv6 Statistics
  NEEDS-REVISION:
212  Increase Acceptable Consensus Age [for 0.2.4.x+]
219  Support for full DNS and DNSSEC resolution in Tor [for 0.2.5.x]

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

[tor-commits] [torspec/master] Prop 311 & 312: Remove TODOs on Prop 313 link

2020-02-10 Thread teor

commit 638a9276d8cb622278efbe6ececf8985bef6de65
Author: teor 
Date:   Mon Feb 10 12:50:25 2020 +1000

Prop 311 & 312: Remove TODOs on Prop 313 link

Part of 33159.
---
 proposals/311-relay-ipv6-reachability.txt | 1 -
 proposals/312-relay-auto-ipv6-addr.txt| 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/proposals/311-relay-ipv6-reachability.txt 
b/proposals/311-relay-ipv6-reachability.txt
index e4c9414..9f536d3 100644
--- a/proposals/311-relay-ipv6-reachability.txt
+++ b/proposals/311-relay-ipv6-reachability.txt
@@ -770,7 +770,6 @@ References:
 
 [Proposal 313: Relay IPv6 Statistics]:

https://gitweb.torproject.org/torspec.git/tree/proposals/313-relay-ipv6-stats.txt
-   (TODO)
 
 [Relay Search]:
https://metrics.torproject.org/rs.html
diff --git a/proposals/312-relay-auto-ipv6-addr.txt 
b/proposals/312-relay-auto-ipv6-addr.txt
index c384d4c..5228c6c 100644
--- a/proposals/312-relay-auto-ipv6-addr.txt
+++ b/proposals/312-relay-auto-ipv6-addr.txt
@@ -1518,7 +1518,7 @@ References:

https://gitweb.torproject.org/torspec.git/tree/proposals/311-relay-ipv6-reachability.txt
 
 [Proposal 313: Relay IPv6 Statistics]:
-   
https://gitweb.torproject.org/torspec.git/tree/proposals/313-relay-ipv6-stats.txt
 (TODO)
+   
https://gitweb.torproject.org/torspec.git/tree/proposals/313-relay-ipv6-stats.txt
 
 [RFC 4941: Privacy Extensions for IPv6]:
https://tools.ietf.org/html/rfc4941



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

[tor-commits] [stem/master] Drop tests for invalid signing argument

2020-02-10 Thread atagar

commit 91ef638728b398fcfed01ea243afecaf488b1fb7
Author: Damian Johnson 
Date:   Mon Feb 10 17:39:59 2020 -0800

Drop tests for invalid signing argument

Oops, I forgot to install cryptography under python 3.7 so I didn't exercise
several tests. This doesn't fix all the failures but corrects the most 
obvious
(we removed the sign argument when it was irrelevant).
---
 test/unit/descriptor/extrainfo_descriptor.py  | 5 -
 test/unit/descriptor/hidden_service_v2.py | 4 
 test/unit/descriptor/microdescriptor.py   | 4 
 test/unit/descriptor/networkstatus/directory_authority.py | 4 
 test/unit/descriptor/networkstatus/document_v2.py | 4 
 test/unit/descriptor/networkstatus/document_v3.py | 4 
 test/unit/descriptor/networkstatus/key_certificate.py | 4 
 test/unit/descriptor/router_status_entry.py   | 6 --
 test/unit/descriptor/server_descriptor.py | 1 -
 9 files changed, 36 deletions(-)

diff --git a/test/unit/descriptor/extrainfo_descriptor.py 
b/test/unit/descriptor/extrainfo_descriptor.py
index 6eea7fde..25cbf489 100644
--- a/test/unit/descriptor/extrainfo_descriptor.py
+++ b/test/unit/descriptor/extrainfo_descriptor.py
@@ -142,11 +142,6 @@ 
k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw
 
 self.assertEqual('@type bridge-extra-info 1.0', 
str(desc.type_annotation()))
 
-  @test.require.cryptography
-  def test_descriptor_signing(self):
-RelayExtraInfoDescriptor.create(sign = True)
-self.assertRaisesWith(NotImplementedError, 'Signing of 
BridgeExtraInfoDescriptor not implemented', BridgeExtraInfoDescriptor.create, 
sign = True)
-
   def test_multiple_metrics_bridge_descriptors(self):
 """
 Check that we can read bridge descriptors when there's multiple in a file.
diff --git a/test/unit/descriptor/hidden_service_v2.py 
b/test/unit/descriptor/hidden_service_v2.py
index fd90f693..54553d03 100644
--- a/test/unit/descriptor/hidden_service_v2.py
+++ b/test/unit/descriptor/hidden_service_v2.py
@@ -278,10 +278,6 @@ class TestHiddenServiceDescriptorV2(unittest.TestCase):
 self.assertEqual([2, 3], desc.protocol_versions)
 
   @test.require.cryptography
-  def test_descriptor_signing(self):
-self.assertRaisesWith(NotImplementedError, 'Signing of 
HiddenServiceDescriptorV2 not implemented', HiddenServiceDescriptorV2.create, 
sign = True)
-
-  @test.require.cryptography
   def test_with_basic_auth(self):
 """
 Parse a descriptor with introduction-points encrypted with basic auth.
diff --git a/test/unit/descriptor/microdescriptor.py 
b/test/unit/descriptor/microdescriptor.py
index 8d2c07e7..b0b8ebaf 100644
--- a/test/unit/descriptor/microdescriptor.py
+++ b/test/unit/descriptor/microdescriptor.py
@@ -98,10 +98,6 @@ class TestMicrodescriptor(unittest.TestCase):
 self.assertEqual({}, desc.protocols)
 self.assertEqual([], desc.get_unrecognized_lines())
 
-  @test.require.cryptography
-  def test_descriptor_signing(self):
-self.assertRaisesWith(NotImplementedError, 'Signing of Microdescriptor not 
implemented', Microdescriptor.create, sign = True)
-
   def test_unrecognized_line(self):
 """
 Includes unrecognized content in the descriptor.
diff --git a/test/unit/descriptor/networkstatus/directory_authority.py 
b/test/unit/descriptor/networkstatus/directory_authority.py
index 325fad12..6153aa64 100644
--- a/test/unit/descriptor/networkstatus/directory_authority.py
+++ b/test/unit/descriptor/networkstatus/directory_authority.py
@@ -52,10 +52,6 @@ class TestDirectoryAuthority(unittest.TestCase):
 self.assertEqual(None, authority.legacy_dir_key)
 self.assertEqual([], authority.get_unrecognized_lines())
 
-  @test.require.cryptography
-  def test_descriptor_signing(self):
-self.assertRaisesWith(NotImplementedError, 'Signing of DirectoryAuthority 
not implemented', DirectoryAuthority.create, sign = True)
-
   def test_unrecognized_line(self):
 """
 Includes unrecognized content in the descriptor.
diff --git a/test/unit/descriptor/networkstatus/document_v2.py 
b/test/unit/descriptor/networkstatus/document_v2.py
index 7dcc235b..7fb96328 100644
--- a/test/unit/descriptor/networkstatus/document_v2.py
+++ b/test/unit/descriptor/networkstatus/document_v2.py
@@ -104,7 +104,3 @@ TpQQk3nNQF8z6UIvdlvP+DnJV4izWVkQEZgUZgIVM0E=
 self.assertEqual([], document.server_versions)
 self.assertEqual([], document.options)
 self.assertEqual('moria2', document.signing_authority)
-
-  @test.require.cryptography
-  def test_descriptor_signing(self):
-self.assertRaisesWith(NotImplementedError, 'Signing of 
NetworkStatusDocumentV2 not implemented', NetworkStatusDocumentV2.create, sign 
= True)
diff --git a/test/unit/descriptor/networkstatus/document_v3.py 
b/test/unit/descriptor/networkstatus/document_v3.py
index 62ce6073..3e3b6953 100644
--- a/test/unit/descriptor/networkstatus/document_v3.py
+++

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

2020-02-10 Thread nickm

commit dac185edbae6b4802e517d744891bb831e863880
Merge: dcbf6611d 5d56c1f4b
Author: Nick Mathewson 
Date:   Mon Feb 10 19:43:17 2020 -0500

Merge branch 'maint-0.4.3'

"ours" merge to avoid version bump.




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

[tor-commits] [tor/master] Update to 0.4.3.2-alpha-dev

2020-02-10 Thread nickm

commit 5d56c1f4b29c79d17002872c70e6bb2d561cd2ba
Author: Nick Mathewson 
Date:   Mon Feb 10 19:42:31 2020 -0500

Update to 0.4.3.2-alpha-dev
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index e31b5751f..009d23aaa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.3.2-alpha])
+AC_INIT([tor],[0.4.3.2-alpha-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -16,7 +16,7 @@ configure_flags="$*"
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2020-02-10"], # for 0.4.3.2-alpha
+AC_DEFINE(APPROX_RELEASE_DATE, ["2020-02-11"], # for 0.4.3.2-alpha-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 6e5775a5e..8b7cafb4a 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.3.2-alpha"
+!define VERSION "0.4.3.2-alpha-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 5422c9748..7154b30f9 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.3.2-alpha"
+#define VERSION "0.4.3.2-alpha-dev"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



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

[tor-commits] [tor/master] Update to 0.4.4.0-alpha-dev

2020-02-10 Thread nickm

commit 71d96cefc0314bc3ad6cad867586c492a287c6c9
Author: Nick Mathewson 
Date:   Mon Feb 10 19:43:54 2020 -0500

Update to 0.4.4.0-alpha-dev
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index e31b5751f..aa511a391 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.3.2-alpha])
+AC_INIT([tor],[0.4.4.0-alpha-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -16,7 +16,7 @@ configure_flags="$*"
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2020-02-10"], # for 0.4.3.2-alpha
+AC_DEFINE(APPROX_RELEASE_DATE, ["2020-02-11"], # for 0.4.4.0-alpha-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 6e5775a5e..fb13a2eb3 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.3.2-alpha"
+!define VERSION "0.4.4.0-alpha-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 5422c9748..3c8f91d53 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.3.2-alpha"
+#define VERSION "0.4.4.0-alpha-dev"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR

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

[tor-commits] [tpo/master] tor 0.4.3.2-alpha is released

2020-02-10 Thread nickm

commit 0b2ed3b34ada0a9aaf014e19e3a274787de455a1
Author: Nick Mathewson 
Date:   Mon Feb 10 19:20:59 2020 -0500

tor 0.4.3.2-alpha is released
---
 databags/versions.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/databags/versions.ini b/databags/versions.ini
index 57f8ba2..c49b079 100644
--- a/databags/versions.ini
+++ b/databags/versions.ini
@@ -9,5 +9,5 @@ version = 9.5a4
 version = 0.4.2.6
 
 [tor-alpha]
-version = 0.4.3.1-alpha
+version = 0.4.3.2-alpha
 

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

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2020-02-10 Thread translation

commit 903823329a7059059de14873cf0a77574b773b24
Author: Translation commit bot 
Date:   Tue Feb 11 00:20:09 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+el.po | 80 +-
 1 file changed, 51 insertions(+), 29 deletions(-)

diff --git a/contents+el.po b/contents+el.po
index 53ea4f55a0..29bf3f7178 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -168,7 +168,7 @@ msgstr "ÎÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·"
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
-msgstr "Î£Î§ÎÎ¤ÎÎÎ ÎÎ Î¤ÎÎ Î ÎÎ¡ÎÎÎÎÎ¤Î"
+msgstr "Î£Î§ÎÎ¤ÎÎÎ ÎÎ Î¤ÎÎ Î ÎÎ¡ÎÎÎÎÎ¤Î Tor Browser"
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.description)
@@ -394,6 +394,7 @@ msgstr ""
 #: (content/downloading/contents+en.lrtopic.body)
 msgid "### TO USE GETTOR VIA JABBER/XMPP (JITSI, COYIM, ETC.):"
 msgstr ""
+"### ÎÎÎ ÎÎ Î§Î¡ÎÎ£ÎÎÎÎ ÎÎÎÎ£ÎÎ¤Î Î¤Î GETTOR ÎÎÎ£Î© 
JABBER/XMPP (JITSI, COYIM, ETC.):"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -677,7 +678,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.title)
 msgid "CIRCUMVENTION"
-msgstr "ÎÎÎ¤ÎÎ£Î¤Î¡ÎÎ¤ÎÎÎÎ£Î"
+msgstr "Î ÎÎ¡ÎÎÎÎÎ¨Î"
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.description)
@@ -691,7 +692,7 @@ msgid ""
 "Service Provider or by a government."
 msgstr ""
 "Î Î¬Î¼ÎµÏÎ· ÏÏÏÏÎ²Î±ÏÎ· ÏÏÎ¿ Î´Î¯ÎºÏÏÎ¿ Tor Î¼ÏÎ¿ÏÎµÎ¯ 
Î¼ÎµÏÎ¹ÎºÎÏ ÏÎ¿ÏÎÏ Î½Î± ÏÎ±ÏÎµÎ¼ÏÎ¿Î´Î¹ÏÏÎµÎ¯ Î±ÏÏ "
-"ÏÎ¿Î½ Î Î¬ÏÎ¿ÏÎ¿ Î¥ÏÎ·ÏÎµÏÎ¹ÏÎ½ ÏÎ¿Ï ÎÎ¹Î±Î´Î¹ÎºÏÏÎ¿Ï ÏÎ±Ï Î® 
Î±ÏÏ ÏÎ·Î½ ÎºÏÎ²ÎÏÎ½Î·ÏÎ·."
+"ÏÎ¿Î½ ÏÎ¬ÏÎ¿ÏÎ¿ ÏÏÎ·ÏÎµÏÎ¹ÏÎ½ ÏÎ¿Ï Î´Î¹Î±Î´Î¹ÎºÏÏÎ¿Ï ÏÎ±Ï Î® 
Î±ÏÏ ÏÎ·Î½ ÎºÏÎ²ÎÏÎ½Î·ÏÎ·."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -699,9 +700,9 @@ msgid ""
 "Tor Browser includes some circumvention tools for getting around these "
 "blocks. These tools are called âpluggable transportsâ."
 msgstr ""
-"Î¤Î¿ ÏÏÏÎ³ÏÎ±Î¼Î¼Î± ÏÎµÏÎ¹Î®Î³Î·ÏÎ·Ï Tor ÏÎµÏÎ¹Î»Î±Î¼Î²Î¬Î½ÎµÎ¹ 
Î¿ÏÎ¹ÏÎ¼ÎÎ½Î± ÎµÏÎ³Î±Î»ÎµÎ¯Î± ÎºÎ±ÏÎ±ÏÏÏÎ±ÏÎ®Î³Î·ÏÎ·Ï "
-"Î³Î¹Î± Î½Î± ÏÎµÏÎ¬ÏÎµÏÎµ Î±ÏÏÎ¬ ÏÎ± Î¼ÏÎ»Î¿Îº. ÎÏÏÎ¬ ÏÎ± 
ÎµÏÎ³Î±Î»ÎµÎ¯Î± Î¿Î½Î¿Î¼Î¬Î¶Î¿Î½ÏÎ±Î¹ \"ÏÏÎ½Î´ÎµÏÎ¹ÎºÎÏ "
-"Î¼ÎµÏÎ±ÏÎ¿ÏÎÏ\"."
+"Î¤Î¿ ÏÏÏÎ³ÏÎ±Î¼Î¼Î± ÏÎµÏÎ¹Î®Î³Î·ÏÎ·Ï Tor Browser 
ÏÎµÏÎ¹Î»Î±Î¼Î²Î¬Î½ÎµÎ¹ Î¿ÏÎ¹ÏÎ¼ÎÎ½Î± ÎµÏÎ³Î±Î»ÎµÎ¯Î± "
+"ÏÎ±ÏÎ¬ÎºÎ±Î¼ÏÎ·Ï Î³Î¹Î± Î½Î± Î¾ÎµÏÎ¿ÏÏÏÎ¸ÎµÎ¯ÏÎµ Î±ÏÏÎ¬ ÏÎ± 
Î¼ÏÎ»Î¿Îº. ÎÏÏÎ¬ ÏÎ± ÎµÏÎ³Î±Î»ÎµÎ¯Î± Î¿Î½Î¿Î¼Î¬Î¶Î¿Î½ÏÎ±Î¹ "
+"\"ÏÏÎ½Î´ÎµÏÎ¹ÎºÎÏ Î¼ÎµÏÎ±ÏÎ¿ÏÎÏ\"."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -822,9 +823,9 @@ msgid ""
 "select whichever pluggable transport you'd like to use."
 msgstr ""
 "ÎÎ¹Î± Î½Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ Î¼Î¹Î± ÏÏÎ½Î´ÎµÏÎ¹ÎºÎ® 
Î¼ÎµÏÎ±ÏÎ¿ÏÎ¬, ÎºÎ¬Î½ÏÎµ ÎºÎ»Î¹Îº ÏÏÎ¿ 'Î¡ÏÎ¸Î¼Î¹ÏÎ·' ÎºÎ±ÏÎ¬"
-" ÏÎ·Î½ ÎµÎºÎºÎ¯Î½Î·ÏÎ· ÏÎ¿Ï ÏÏÎ¿Î³ÏÎ¬Î¼Î¼Î±ÏÎ¿Ï ÏÎµÏÎ¹Î®Î³Î·ÏÎ·Ï 
Tor Î³Î¹Î± ÏÏÏÏÎ· ÏÎ¿ÏÎ¬. Î£ÏÎ¿ ÏÎ±ÏÎ¬Î¸ÏÏÎ¿ "
-"ÏÎ¿Ï ÎµÎ¼ÏÎ±Î½Î¯Î¶ÎµÏÎ±Î¹ Î±ÏÏ ÏÎ¿ Î±Î½Î±ÏÏÏÏÏÏÎ¼ÎµÎ½Î¿ 
Î¼ÎµÎ½Î¿Ï, ÎµÏÎ¹Î»ÎÎ¾ÏÎµ Î¿ÏÎ¿Î¹Î±Î´Î®ÏÎ¿ÏÎµ ÏÏÎ½Î´ÎµÏÎ¹ÎºÎ® "
-"Î¼ÎµÏÎ±ÏÎ¿ÏÎ¬ ÏÎ¿Ï Î¸ÎÎ»ÎµÏÎµ Î½Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ."
+" ÏÎ·Î½ ÎµÎºÎºÎ¯Î½Î·ÏÎ· ÏÎ¿Ï ÏÏÎ¿Î³ÏÎ¬Î¼Î¼Î±ÏÎ¿Ï ÏÎµÏÎ¹Î®Î³Î·ÏÎ·Ï 
Tor Browser Î³Î¹Î± ÏÏÏÏÎ· ÏÎ¿ÏÎ¬. Î£ÏÎ¿ "
+"ÏÎ±ÏÎ¬Î¸ÏÏÎ¿ ÏÎ¿Ï ÎµÎ¼ÏÎ±Î½Î¯Î¶ÎµÏÎ±Î¹ Î±ÏÏ ÏÎ¿ Î±Î½Î±ÏÏÏ
ÏÏÏÎ¼ÎµÎ½Î¿ Î¼ÎµÎ½Î¿Ï, ÎµÏÎ¹Î»ÎÎ¾ÏÎµ Î¿ÏÎ¿Î¹Î±Î´Î®ÏÎ¿ÏÎµ "
+"ÏÏÎ½Î´ÎµÏÎ¹ÎºÎ® Î¼ÎµÏÎ±ÏÎ¿ÏÎ¬ ÏÎ¿Ï Î¸ÎÎ»ÎµÏÎµ Î½Î± 
ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -834,11 +835,12 @@ msgid ""
 "'Use a bridge', and from the drop-down menu 'Select a built-in bridge', "
 "choose whichever pluggable transport you'd like to use."
 msgstr ""
-"ÎÎ½Î±Î»Î»Î±ÎºÏÎ¹ÎºÎ¬, Î±Î½ ÎÏÎµÏÎµ ÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÎµÎ¹ ÏÎ¿ 
ÏÏÏÎ³ÏÎ±Î¼Î¼Î± ÏÎµÏÎ¹Î®Î³Î·ÏÎ·Ï Tor, ÎºÎ¬Î½ÏÎµ ÎºÎ»Î¹Îº "
-"ÏÏÎ¿ 'Î ÏÎ¿ÏÎ¹Î¼Î®ÏÎµÎ¹Ï' ÏÏÎ¿ Î¼ÎµÎ½Î¿Ï ÏÎ¬Î¼ÏÎ¿ÏÏÎ³ÎºÎµÏ 
ÎºÎ±Î¹, ÏÏÎ· ÏÏÎ½ÎÏÎµÎ¹Î±, ÏÏÎ¿ 'Tor' ÏÏÎ·Î½ "
-"ÏÎ»Î±ÏÎ½Î® Î³ÏÎ±Î¼Î¼Î®. Î£ÏÎ·Î½ ÎµÎ½ÏÏÎ·ÏÎ± \"ÎÎÏÏÏÎµÏ\", 
ÎµÏÎ¹Î»ÎÎ¾ÏÎµ ÏÎ¿ ÏÎ»Î±Î¯ÏÎ¹Î¿ \"Î§ÏÎ®ÏÎ· "
-"Î³ÎÏÏÏÎ±Ï\" ÎºÎ±Î¹, Î±ÏÏ ÏÎ¿ Î±Î½Î±ÏÏÏÏÏÏÎ¼ÎµÎ½Î¿ Î¼ÎµÎ½Î¿Ï 
\"ÎÏÎ¹Î»Î¿Î³Î® ÎµÎ½ÏÏÎ¼Î±ÏÏÎ¼ÎÎ½Î·Ï Î³ÎÏÏÏÎ±Ï\","
-" ÎµÏÎ¹Î»ÎÎ¾ÏÎµ Î¿ÏÎ¿Î¹Î±Î´Î®ÏÎ¿ÏÎµ ÏÏÎ½Î´ÎµÏÎ¹ÎºÎ® Î¼ÎµÏÎ±ÏÎ¿ÏÎ¬ 
Î¸ÎÎ»ÎµÏÎµ Î½Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ."
+"ÎÎ½Î±Î»Î»Î±ÎºÏÎ¹ÎºÎ¬, Î±Î½ ÎÏÎµÏÎµ

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2020-02-10 Thread translation

commit 93b79616708a652f7ebe61be0c32ec85a8fe0b94
Author: Translation commit bot 
Date:   Mon Feb 10 23:52:59 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+el.po | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/contents+el.po b/contents+el.po
index 8eb3f56934..14500a806b 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -7,6 +7,7 @@
 # LaScapigliata , 2019
 # Panagiotis Vasilopoulos, 2019
 # Emma Peel, 2020
+# Dimitris Adamakis , 2020
 # 
 msgid ""
 msgstr ""
@@ -14,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-01-20 16:43+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Emma Peel, 2020\n"
+"Last-Translator: Dimitris Adamakis , 2020\n"
 "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2910,7 +2911,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-editing-torrc/
 #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description)
 msgid "On macOS:"
-msgstr ""
+msgstr "Î£ÏÎ± macOS:"
 
 #: https//support.torproject.org/tbb/tbb-editing-torrc/
 #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description)
@@ -2925,6 +2926,9 @@ msgid ""
 "* Note the Library folder is hidden on newer versions of macOS. To navigate "
 "to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
+"* Î£Î·Î¼ÎµÎ¹ÏÏÏÎµ ÏÏÎ¹ Î¿ ÏÎ¬ÎºÎµÎ»Î¿Ï ÏÎ·Ï ÎÎ¹Î²Î»Î¹Î¿Î¸Î®ÎºÎ·Ï 
ÎµÎ¯Î½Î±Î¹ ÎºÏÏÎ¼Î¼ÎÎ½Î¿Ï ÏÎµ Î½ÎµÏÏÎµÏÎµÏ "
+"ÎµÎºÎ´ÏÏÎµÎ¹Ï ÏÎ¿Ï macOS. ÎÎ¹Î± Î½Î± Î¼ÎµÏÎ±Î²ÎµÎ¯ÏÎµ ÏÎµ Î±ÏÏÏÎ½ 
ÏÎ¿ ÏÎ¬ÎºÎµÎ»Î¿ ÏÏÎ¿ Finder, ÎµÏÎ¹Î»ÎÎ¾ÏÎµ"
+" \"Go to Folder ...\" ÏÏÎ¿ Î¼ÎµÎ½Î¿Ï \"Go\"."
 
 #: https//support.torproject.org/tbb/tbb-editing-torrc/
 #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description)

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

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2020-02-10 Thread translation

commit dc811a0aa94848a867a17b5edca52642ffa1420e
Author: Translation commit bot 
Date:   Mon Feb 10 23:49:35 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+el.po | 45 ++---
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/contents+el.po b/contents+el.po
index f9f15bde12..53ea4f55a0 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -2004,11 +2004,20 @@ msgid ""
 " displaying correctly, so Tor Browserâs default setting is to allow all "
 "websites to run scripts in \"Standard\" mode."
 msgstr ""
+"Î§ÏÎ®ÏÏÎµÏ ÏÎ¿Ï ÎµÏÎ¹Î¸ÏÎ¼Î¿ÏÎ½ ÏÏÎ·Î»Ï Î²Î±Î¸Î¼Ï 
Î±ÏÏÎ¬Î»ÎµÎ¹Î±Ï ÎºÎ±ÏÎ¬ ÏÎ·Î½ ÏÎµÏÎ¹Î®Î³Î·ÏÎ® ÏÎ¿ÏÏ ÏÏÎ¿ "
+"Î´Î¹Î±Î´Î¯ÎºÏÏÎ¿, Î¸Î± ÏÏÎÏÎµÎ¹ Î½Î± Î¿ÏÎ¯ÏÎ¿ÏÎ½ ÏÎ¿ 
[ÎÏÎ¯ÏÎµÎ´Î¿ ÎÏÏÎ¬Î»ÎµÎ¹Î±Ï](../security-"
+"settings/) ÏÎ¿Ï Tor Browser ÏÏÎ¿ \"ÎÏÏÎ±Î»ÎÏÏÎµÏÎ±\" (ÏÎ¿ 
Î¿ÏÎ¿Î¯Î¿ Î±ÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹ÎµÎ¯ ÏÎ· "
+"JavaScript Î³Î¹Î± ÏÎ»ÎµÏ  ÏÎ¹Ï Î¹ÏÏÎ¿ÏÎµÎ»Î¯Î´ÎµÏ ÏÎ¿Ï Î´ÎµÎ½ 
ÎµÎ¯Î½Î±Î¹ HTTPS) Î® ÏÏÎ¿ "
+"\"ÎÏÏÎ±Î»ÎÏÏÎµÏÎ¿\" (ÏÎ¿Ï Î±ÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹ÎµÎ¯ Î³Î¹Î± ÏÎ»ÎµÏ 
ÏÎ¹Ï Î¹ÏÏÎ¿ÏÎµÎ»Î¯Î´ÎµÏ) . Î Î±Ï' ÏÎ»Î± "
+"Î±ÏÏÎ¬, Î· Î±ÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ· ÏÏÎ½ JavaScript Î¸Î± 
Î±ÏÎ¿ÏÏÎÏÎµÎ¹ ÏÎ¿Î»Î»ÎÏ Î¹ÏÏÎ¿ÏÎµÎ»Î¯Î´ÎµÏ Î±ÏÏ "
+"ÏÎ·Î½ ÎºÎ±Î½Î¿Î½Î¹ÎºÎ® ÏÎ¿ÏÏ Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¯Î±, Î¿ÏÏÏÎµ Î· 
ÏÏÎ¿ÎµÏÎ¹Î»ÎµÎ³Î¼ÎÎ½Î· ÏÏÎ¸Î¼Î¹ÏÎ· ÏÎ¿Ï Tor Browser "
+"ÎµÎ¯Î½Î±Î¹ Î½Î± ÎµÏÎ¹ÏÏÎÏÎµÎ¹ ÏÎµ ÏÎ»ÎµÏ ÏÎ¹Ï 
Î¹ÏÏÎ¿ÏÎµÎ»Î¯Î´ÎµÏ Î½Î± Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¿ÏÎ½ Î¸ÎÏÎ¿Î½ÏÎ±Ï ÏÎ¿ "
+"\"ÎÎ±Î½Î¿Î½Î¹ÎºÏ\" ÏÏÎ¿ÏÎ¯Î»."
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
 msgid "### BROWSER ADD-ONS"
-msgstr ""
+msgstr "### Î Î¡ÎÎ£ÎÎÎ¤Î Î¤ÎÎ¥ BROWSER"
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2039,7 +2048,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
 msgid "UNINSTALLING"
-msgstr ""
+msgstr "ÎÎ ÎÎÎÎÎ¤ÎÎ£Î¤ÎÎ£Î"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
@@ -2055,7 +2064,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid "On Windows:"
-msgstr ""
+msgstr "Î£ÏÎ± Windows:"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -2063,6 +2072,8 @@ msgid ""
 "* Locate your Tor Browser folder or application. The default location is the"
 " Desktop."
 msgstr ""
+"* ÎÎ½ÏÎ¿ÏÎ¯ÏÏÎµ ÏÎ¿ ÏÎ¬ÎºÎµÎ»Î¿ ÏÎ¿Ï Tor Browser Î® ÏÎ·Î½ 
ÎµÏÎ±ÏÎ¼Î¿Î³Î®. Î ÏÏÎ¿ÎµÏÎ¹Î»ÎµÎ³Î¼ÎÎ½Î· Î¸ÎÏÎ· "
+"ÎµÎ¯Î½Î±Î¹ Î· ÎµÏÎ¹ÏÎ¬Î½ÎµÎ¹Î± ÎµÏÎ³Î±ÏÎ¯Î±Ï."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -2077,7 +2088,7 @@ msgstr "* ÎÎ´ÎµÎ¹Î¬ÏÏÎµ ÏÎ¿Î½ ÎÎ¬Î´Î¿ 
ÎÏÎ¿ÏÏÎ¹Î¼Î¬ÏÏÎ½ ÏÎ±Ï"
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid "On macOS:"
-msgstr ""
+msgstr "Î£ÏÎ± macOS:"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -2085,16 +2096,18 @@ msgid ""
 "* Locate your Tor Browser application. The default location is the "
 "Applications folder."
 msgstr ""
+"* ÎÎ½ÏÎ¿ÏÎ¯ÏÏÎµ ÏÎ·Î½ ÎµÏÎ±ÏÎ¼Î¿Î³Î® ÏÎ¿Ï Tor Browser. Î 
ÏÏÎ¿ÎµÏÎ¹Î»ÎµÎ³Î¼ÎÎ½Î· Î¸ÎÏÎ· ÎµÎ¯Î½Î±Î¹ Î¿ "
+"ÏÎ¬ÎºÎµÎ»Î¿Ï \"ÎÏÎ±ÏÎ¼Î¿Î³ÎÏ\"."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid "* Move the Tor Browser application to Trash."
-msgstr ""
+msgstr "* ÎÎµÏÎ±ÎºÎ¹Î½Î®ÏÏÎµ ÏÎ·Î½ ÎµÏÎ±ÏÎ¼Î¿Î³Î® Tor Browser ÏÏÎ¿Î½ 
ÎÎ¬Î´Î¿ Î±ÏÎ¿ÏÏÎ¹Î¼Î¼Î¬ÏÏÎ½."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid "* Go to your `~/Library/Application Support/` folder."
-msgstr ""
+msgstr "* ÎÎµÏÎ±Î²ÎµÎ¯ÏÎµ ÏÏÎ¿Î½ ÏÎ¬ÎºÎµÎ»Î¿ `~/Library/Application 
Support/`."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -2102,6 +2115,9 @@ msgid ""
 "* Note the Library folder is hidden on newer versions of macOS. To navigate "
 "to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
+"* Î£Î·Î¼ÎµÎ¹ÏÏÏÎµ ÏÏÎ¹ Î¿ ÏÎ¬ÎºÎµÎ»Î¿Ï ÏÎ·Ï ÎÎ¹Î²Î»Î¹Î¿Î¸Î®ÎºÎ·Ï 
ÎµÎ¯Î½Î±Î¹ ÎºÏÏÎ¼Î¼ÎÎ½Î¿Ï ÏÎµ Î½ÎµÏÏÎµÏÎµÏ "
+"ÎµÎºÎ´ÏÏÎµÎ¹Ï ÏÎ¿Ï macOS. ÎÎ¹Î± Î½Î± Î¼ÎµÏÎ±Î²ÎµÎ¯ÏÎµ ÏÎµ Î±ÏÏÏÎ½ 
ÏÎ¿ ÏÎ¬ÎºÎµÎ»Î¿ ÏÏÎ¿ Finder, ÎµÏÎ¹Î»ÎÎ¾ÏÎµ"
+" \"Go to Folder ...\" ÏÏÎ¿ Î¼ÎµÎ½Î¿Ï \"Go\"."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -2109,12 +2125,16 @@ msgid ""
 ""
 msgstr ""
+""
 
 #:

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2020-02-10 Thread translation

commit 7cc69e94bdc3e80defe844e2420086daf4de453c
Author: Translation commit bot 
Date:   Mon Feb 10 23:19:55 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+el.po | 45 +++--
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/contents+el.po b/contents+el.po
index eefa9a4187..f9f15bde12 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -1736,7 +1736,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
 msgid "### UPDATING TOR BROWSER AUTOMATICALLY"
-msgstr ""
+msgstr "### Î ÎÎÎÎÎÎ¡Î©Î£Î Î¤ÎÎ¥ Tor Browser ÎÎÎÎÎ¤ÎÎ 
ÎÎ¥Î¤ÎÎÎÎ¤Î"
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -1749,11 +1749,14 @@ msgid ""
 "When you are prompted to update Tor Browser, click on hamburger menu (main "
 "menu), then select âRestart to update Tor browserâ."
 msgstr ""
+"ÎÏÎ±Î½ ÏÎ±Ï Î¶Î·ÏÎ·Î¸ÎµÎ¯ Î½Î± Î±Î½Î±Î²Î±Î¸Î¼Î¯ÏÎµÏÎµ ÏÎ¿Î½ Tor 
Browser, ÎºÎ¬Î½ÏÎµ ÎºÎ»Î¹Îº ÏÏÎ¿ Î¼ÎµÎ½Î¿Ï "
+"ÏÎ¬Î¼ÏÎ¿ÏÏÎ³ÎºÎµÏ (ÎºÎµÎ½ÏÏÎ¹ÎºÏ Î¼ÎµÎ½Î¿Ï) ÎºÎ±Î¹ ÏÏÎ· ÏÏ
Î½ÎÏÎµÎ¹Î± ÎµÏÎ¹Î»ÎÎ¾ÏÎµ \"ÎÏÎ±Î½ÎµÎºÎºÎ¯Î½Î·ÏÎ· Î³Î¹Î± "
+"ÎµÎ½Î·Î¼ÎÏÏÏÎ· ÏÎ¿Ï Tor Browser\"."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -1761,11 +1764,14 @@ msgid ""
 "Wait for the update to download and install, then Tor Browser will restart "
 "itself. You will now be running the latest version."
 msgstr ""
+"Î ÎµÏÎ¹Î¼ÎÎ½ÎµÏÎµ Î½Î± Î³Î¯Î½ÎµÎ¹ Î»Î®ÏÎ· ÎºÎ±Î¹ ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· 
ÏÎ·Ï ÎµÎ½Î·Î¼ÎµÏÏÎ¼ÎÎ½Î·Ï ÎÎºÎ´Î¿ÏÎ·Ï, ÎºÎ±Î¹ ÏÏÎ· "
+"ÏÏÎ½ÎÏÎµÎ¹Î± ÏÎ¿ Tor Browser Î¸Î± ÎµÏÎ±Î½ÎµÎºÎºÎ¹Î½Î·Î¸ÎµÎ¯ Î±ÏÏ 
Î¼ÏÎ½Î¿ ÏÎ¿Ï. ÎÎ± ÎÏÎµÏÎµ ÏÏÏÎ± ÏÎ·Î½ ÏÎ¹Î¿"
+" ÏÏÏÏÏÎ±ÏÎ· ÎÎºÎ´Î¿ÏÎ·."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
 msgid "### UPDATING TOR BROWSER MANUALLY"
-msgstr ""
+msgstr "### ÎÎÎÎÎÎ¡Î©Î£Î Î¤ÎÎ¥ Tor Browser Î§ÎÎÎ¡ÎÎÎÎÎÎ¤Î"
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -1782,6 +1788,9 @@ msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
 "(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
+"ÎÎ±ÏÎ±ÏÎ³Î®ÏÏÎµ ÏÎ¿ Tor Browser Î±ÏÏ ÏÎ¿ ÏÏÏÏÎ·Î¼Î¬ ÏÎ±Ï, 
Î´Î¹Î±Î³ÏÎ¬ÏÎ¿Î½ÏÎ±Ï ÏÎ¿Î½ ÏÎ¬ÎºÎµÎ»Î¿ ÏÎ¿Ï ÏÎ¿"
+" ÏÎµÏÎ¹ÎÏÎµÎ¹ (Î±Î½Î±ÏÏÎÎ¾ÏÎµ ÏÏÎ·Î½ ÎµÎ½ÏÏÎ·ÏÎ± 
[ÎÎ±ÏÎ¬ÏÎ³Î·ÏÎ· ÎÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï](/ÎºÎ±ÏÎ¬ÏÎ³Î·ÏÎ· "
+"ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï) Î³Î¹Î± ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ 
ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -1789,11 +1798,14 @@ msgid ""
 "Visit https://www.torproject.org/download/ and download a copy of the latest"
 " Tor Browser release, then install it as before."
 msgstr ""
+"ÎÏÎ¹ÏÎºÎµÏÎ¸ÎµÎ¯ÏÎµ ÏÎ· Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· 
https://www.torproject.org/download/ ÎºÎ±Î¹ ÎºÎ¬Î½ÏÎµ "
+"Î»Î®ÏÎ· ÎµÎ½ÏÏ Î±Î½ÏÎ¹Î³ÏÎ¬ÏÎ¿Ï ÏÎ·Ï ÏÎµÎ»ÎµÏÏÎ±Î¯Î±Ï 
ÎÎºÎ´Î¿ÏÎ·Ï ÏÎ¿Ï Tor Browser ÎºÎ±Î¹ ÏÏÎ· ÏÏÎ½ÎÏÎµÎ¹Î±"
+" ÎµÎ³ÎºÎ±ÏÎ±ÏÏÎ®ÏÏÎµ ÏÎ¿ ÏÏÏÏ ÏÏÎ¹Î½."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.title)
 msgid "TROUBLESHOOTING"
-msgstr ""
+msgstr "ÎÎÎ¤ÎÎÎÎ¤Î©Î ÎÎ£Î Î Î¡ÎÎÎÎÎÎÎ¤Î©Î"
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.description)
@@ -1814,7 +1826,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid "### QUICK FIXES"
-msgstr ""
+msgstr "### ÎÎ¡ÎÎÎÎ¡ÎÎ£ ÎÎ ÎÎÎÎÎ¡ÎÎ©Î£ÎÎÎ£"
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -1873,7 +1885,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid "### IS YOUR CONNECTION CENSORED?"
-msgstr ""
+msgstr "### Î Î£Î¥ÎÎÎÎ£Î Î£ÎÎ£ ÎÎÎÎÎ ÎÎÎÎÎÎÎÎ¡ÎÎÎÎÎ;"
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -1882,11 +1894,14 @@ msgid ""
 "censoring connections to the Tor network. Read the "
 "[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
+"ÎÎ¬Î½ ÎµÎ¾Î±ÎºÎ¿Î»Î¿ÏÎ¸ÎµÎ¯ÏÎµ Î½Î± Î¼Î·Î½ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÏÏ
Î½Î´ÎµÎ¸ÎµÎ¯ÏÎµ, Î¿ ÏÎ¬ÏÎ¿ÏÎ¿Ï ÏÏÎ·ÏÎµÏÎ¹ÏÎ½ "
+"Internet ÎµÎ½Î´ÎÏÎµÏÎ±Î¹ Î½Î± Î»Î¿Î³Î¿ÎºÏÎ¯Î½ÎµÎ¹ ÏÎ¹Ï ÏÏ
Î½Î´ÎÏÎµÎ¹Ï ÏÏÎ¿ Î´Î¯ÎºÏÏÎ¿ Tor. ÎÎ¹Î±Î²Î¬ÏÏÎµ ÏÎ·Î½ "
+"ÎµÎ½ÏÏÎ·ÏÎ± [Î Î±ÏÎ¬ÎºÎ±Î¼ÏÎ·](/ÏÎ±ÏÎ¬ÎºÎ±Î¼ÏÎ·)

[tor-commits] [stem/master] Tests errored with a '--log' argument

2020-02-10 Thread atagar

commit a668cd8f4958431a3a5dbb33662e2acc304ee67a
Author: Damian Johnson 
Date:   Mon Feb 10 15:05:17 2020 -0800

Tests errored with a '--log' argument

Oops, I removed our LogBuffer in commit 76b6b49 but it's still used by
run_tests.py when we have a '--log' argument. Caught thanks to our Jenkins
tests...

  Traceback (most recent call last):
File "./run_tests.py", line 478, in 
  main()
File "./run_tests.py", line 238, in main
  handler = logging_buffer = 
stem.util.log.LogBuffer(args.logging_runlevel)
  AttributeError: module 'stem.util.log' has no attribute 'LogBuffer'
---
 run_tests.py   | 7 +--
 test/output.py | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/run_tests.py b/run_tests.py
index 91333084..16fbe267 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -10,8 +10,10 @@ import errno
 import io
 import importlib
 import logging
+import logging.handlers
 import multiprocessing
 import os
+import queue
 import signal
 import sys
 import threading
@@ -227,7 +229,7 @@ def main():
   # Test logging. If '--log-file' is provided we log to that location,
   # otherwise we buffer messages and log to stdout after its test completes.
 
-  logging_buffer = None
+  logging_buffer = queue.Queue()
 
   if args.logging_runlevel:
 if args.logging_path:
@@ -235,7 +237,8 @@ def main():
   handler.setLevel(stem.util.log.logging_level(args.logging_runlevel))
   handler.setFormatter(stem.util.log.FORMATTER)
 else:
-  handler = logging_buffer = stem.util.log.LogBuffer(args.logging_runlevel)
+  handler = logging.handlers.QueueHandler(logging_buffer)
+  handler.setLevel(stem.util.log.logging_level(args.logging_runlevel))
 
 stem.util.log.get_logger().addHandler(handler)
 
diff --git a/test/output.py b/test/output.py
index efd27b56..4ee5dfa2 100644
--- a/test/output.py
+++ b/test/output.py
@@ -87,9 +87,9 @@ def print_logging(logging_buffer):
   if SUPPRESS_STDOUT or logging_buffer is None:
 return
 
-  if not logging_buffer.is_empty():
-for entry in logging_buffer:
-  println(entry.replace('\n', '\n  '), term.Color.MAGENTA)
+  if not logging_buffer.empty():
+while not logging_buffer.empty():
+  println(logging_buffer.get_nowait().getMessage().replace('\n', '\n  '), 
term.Color.MAGENTA)
 
 print('')
 

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

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2020-02-10 Thread translation

commit fd0bb3d9162fe9461e0579238cfd3a13211757cc
Author: Translation commit bot 
Date:   Mon Feb 10 22:50:06 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+el.po | 52 
 1 file changed, 48 insertions(+), 4 deletions(-)

diff --git a/contents+el.po b/contents+el.po
index 07c1231e11..eefa9a4187 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -846,6 +846,8 @@ msgid ""
 "Once you've selected the pluggable transport you'd like to use, click "
 "'Connect' to save your settings."
 msgstr ""
+"ÎÏÎ»Î¹Ï ÎµÏÎ¹Î»ÎÎ¾ÎµÏÎµ ÏÎ·Î½ ÏÏÎ½Î´ÎµÏÎ¹ÎºÎ® Î¼ÎµÏÎ±ÏÎ¿ÏÎ¬ 
ÏÎ¿Ï Î¸ÎÎ»ÎµÏÎµ Î½Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ, ÎºÎ¬Î½ÏÎµ "
+"ÎºÎ»Î¹Îº ÏÏÎ·Î½ ÎµÏÎ¹Î»Î¿Î³Î® 'Î£ÏÎ½Î´ÎµÏÎ·' Î³Î¹Î± Î½Î± 
Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎµÏÎµ ÏÎ¹Ï ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÏÎ±Ï."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -858,6 +860,9 @@ msgid ""
 "Each of the transports listed in Tor Launcherâs menu works in a different "
 "way, and their effectiveness depends on your individual circumstances."
 msgstr ""
+"ÎÎ¬Î¸Îµ Î¼Î¯Î± Î±ÏÏ ÏÎ¹Ï Î¼ÎµÏÎ±ÏÎ¿ÏÎÏ ÏÎ¿Ï 
Î±Î½Î±ÏÎÏÎ¿Î½ÏÎ±Î¹ ÏÏÎ¿ Î¼ÎµÎ½Î¿Ï ÏÎ¿Ï Tor Launcher "
+"Î»ÎµÎ¹ÏÎ¿ÏÏÎ³ÎµÎ¯ Î¼Îµ Î´Î¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÏ ÏÏÏÏÎ¿ ÎºÎ±Î¹ Î· 
Î±ÏÎ¿ÏÎµÎ»ÎµÏÎ¼Î±ÏÎ¹ÎºÏÏÎ·ÏÎ¬ ÏÎ¿ÏÏ ÎµÎ¾Î±ÏÏÎ¬ÏÎ±Î¹ Î±ÏÏ "
+"ÏÎ¹Ï ÏÏÎ¿ÏÏÏÎ¹ÎºÎÏ ÏÎ±Ï ÏÏÎ½Î¸Î®ÎºÎµÏ."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -865,6 +870,9 @@ msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
 " should try the different transports: obfs4, snowflake, and meek-azure."
 msgstr ""
+"ÎÎ¬Î½ ÏÏÎ¿ÏÏÎ±Î¸ÎµÎ¯ÏÎµ Î½Î± ÏÎ±ÏÎ±ÎºÎ¬Î¼ÏÎµÏÎµ Î¼Î¹Î± Î´ÎµÏÎ¼ÎµÏ
Î¼ÎÎ½Î· ÏÏÎ½Î´ÎµÏÎ· Î³Î¹Î± ÏÏÏÏÎ· ÏÎ¿ÏÎ¬, Î¸Î± "
+"ÏÏÎÏÎµÎ¹ Î½Î± Î´Î¿ÎºÎ¹Î¼Î¬ÏÎµÏÎµ ÏÎ¹Ï Î´Î¹Î¬ÏÎ¿ÏÎµÏ 
Î¼ÎµÏÎ±ÏÎ¿ÏÎÏ: obfs4, snowflake ÎºÎ±Î¹ meek-"
+"azure."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -872,6 +880,8 @@ msgid ""
 "If you try all of these options, and none of them gets you online, you will "
 "need to enter bridge addresses manually."
 msgstr ""
+"ÎÎ¬Î½ Î´Î¿ÎºÎ¹Î¼Î¬ÏÎµÏÎµ ÏÎ»ÎµÏ Î±ÏÏÎÏ ÏÎ¹Ï ÎµÏÎ¹Î»Î¿Î³ÎÏ 
ÎºÎ±Î¹ ÎºÎ±Î¼Î¯Î± Î±ÏÏ Î±ÏÏÎÏ Î´ÎµÎ½ ÏÎ±Ï ÏÏÎ½Î´ÎÎµÎ¹ "
+"online, Î¸Î± ÏÏÎµÎ¹Î±ÏÏÎµÎ¯ Î½Î± ÎºÎ±ÏÎ±ÏÏÏÎ¯ÏÎµÏÎµ Î¼Î· Î±Ï
ÏÏÎ¼Î±ÏÎ± ÏÎ¹Ï Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎµÎ¹Ï Î³ÎÏÏÏÎ±Ï."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -891,6 +901,8 @@ msgid ""
 "Most Pluggable Transports, such as obfs4, rely on the use of âbridgeâ "
 "relays."
 msgstr ""
+"ÎÎ¹ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ ÏÏÎ½Î´ÎµÏÎ¹ÎºÎÏ Î¼ÎµÏÎ±ÏÎ¿ÏÎÏ, 
ÏÏÏÏ ÏÎ¿ obfs4, Î²Î±ÏÎ¯Î¶Î¿Î½ÏÎ±Î¹ ÏÏÎ· ÏÏÎ®ÏÎ· "
+"ÏÎµÎ»Î \"Î³ÎÏÏÏÎ±Ï\"."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -898,6 +910,8 @@ msgid ""
 "Most [Pluggable Transports](/circumvention), such as obfs4, rely on the use "
 "of âbridgeâ relays."
 msgstr ""
+"ÎÎ¹ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ [Pluggable 
Transports](/ÎºÎ±ÏÎ±ÏÏÏÎ±ÏÎ®Î³Î·ÏÎ·), ÏÏÏÏ ÏÎ¿ obfs4, "
+"Î²Î±ÏÎ¯Î¶Î¿Î½ÏÎ±Î¹ ÏÏÎ· ÏÏÎ®ÏÎ· ÏÎµÎ»Î \"Î³ÎÏÏÏÎ±Ï\"."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -906,6 +920,9 @@ msgid ""
 "relays, however, they are not listed publicly, so an adversary cannot "
 "identify them easily."
 msgstr ""
+"ÎÏÏÏ ÎºÎ±Î¹ ÏÎ± ÏÏÎ½Î·Î¸Î¹ÏÎ¼ÎÎ½Î± ÏÎµÎ»Î Tor, Î¿Î¹ Î³ÎÏÏÏÎµÏ 
Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¿ÏÎ½ Î±ÏÏ ÎµÎ¸ÎµÎ»Î¿Î½ÏÎÏ. ÏÎµ "
+"Î±Î½ÏÎ¯Î¸ÎµÏÎ· Î¼Îµ ÏÎ¿ÏÏ ÏÏÎ½Î·Î¸Î¹ÏÎ¼ÎÎ½Î± ÏÎµÎ»Î, ÏÏÏÏÏÎ¿, 
Î´ÎµÎ½ Î±Î½Î±ÏÎÏÎ¿Î½ÏÎ±Î¹ Î´Î·Î¼ÏÏÎ¹Î±, Î¿ÏÏÏÎµ Î¿ "
+"ÎµÏÎ¸ÏÏÏ Î´ÎµÎ½ ÏÎ± Î±Î½Î±Î³Î½ÏÏÎ¯Î¶ÎµÎ¹ ÎµÏÎºÎ¿Î»Î±."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -1103,7 +1120,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid "### THE URL BAR"
-msgstr ""
+msgstr "### Î ÎÎ ÎÎ¡Î URL"
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1140,6 +1157,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1162,6 +1181,14 @@ msgid ""
 "[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
 "Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
+"Î£ÏÎ¿ ÎºÏÎºÎ»ÏÎ¼Î±, Î¿ ÏÏÎ»Î±ÎºÎ±Ï ÎºÏÎ¼Î²Î¿Ï Î® Î¿ 
ÎµÎ¹ÏÎ±ÎºÏÎÎ¿Ï ÎºÏÎ¼Î²Î¿Ï ÎµÎ¯Î½Î±Î¹ Î¿ ÏÏÏÏÎ¿Ï ÎºÏÎ¼Î²Î¿Ï ÎºÎ±Î¹"
+" ÎµÏÎ¹Î»ÎÎ³ÎµÏÎ±Î¹ Î±ÏÏÏÎ¼Î±ÏÎ± ÎºÎ±Î¹ ÏÏÏÎ±Î¯Î± Î±ÏÏ ÏÎ¿

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2020-02-10 Thread translation

commit f7701b1ae561551ca408c523090e2fb5acd10e1d
Author: Translation commit bot 
Date:   Mon Feb 10 22:19:58 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+el.po | 33 ++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/contents+el.po b/contents+el.po
index aac360094a..07c1231e11 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -427,6 +427,8 @@ msgid ""
 "1. Navigate to the Tor Browser [download "
 "page](https://www.torproject.org/download)."
 msgstr ""
+"1. Î Î»Î¿Î·Î³Î·Î¸ÎµÎ¯ÏÎµ ÏÏÎ¿Î½ Tor Browser [ÏÎµÎ»Î¯Î´Î± "
+"Î»Î®ÏÎ·Ï](https://www.torproject.org/download)."
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
@@ -439,6 +441,8 @@ msgid ""
 "3. (Recommended) Verify the [file's "
 "signature](https://support.torproject.org/en/tbb/how-to-verify-signature/)."
 msgstr ""
+"3. (Î£ÏÎ½Î¹ÏÏÎ¬ÏÎ±Î¹) ÎÏÎ±Î»Î·Î¸ÎµÏÏÏÎµ ÏÎ·Î½ ÏÏÎ¿Î³ÏÎ±ÏÎ® 
ÏÎ¿Ï "
+"[Î±ÏÏÎµÎ¯Î¿Ï
](https://support.torproject.org/en/tbb/how-to-verify-signature/)."
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
@@ -480,7 +484,7 @@ msgstr "ÎÎ¹Î± GNU/Linux:"
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
 msgid "2. Download the GNU/Linux `.tar.xz` file"
-msgstr ""
+msgstr "2. ÎÎ®ÏÎ· ÏÎ¿Ï Î±ÏÏÎµÎ¯Î¿Ï `.tar.xz` ÏÎ¿Ï GNU/Linux"
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
@@ -488,6 +492,8 @@ msgid ""
 "4. When the download is complete, extract the archive with the command `tar "
 "-xf [TB archive]` or by using an archive manager."
 msgstr ""
+"4. ÎÏÎ±Î½ Î¿Î»Î¿ÎºÎ»Î·ÏÏÎ¸ÎµÎ¯ Î· Î»Î®ÏÎ·, Î±ÏÎ¿ÏÏÎ¼ÏÎ¹ÎÏÏÎµ ÏÎ¿ 
Î±ÏÏÎµÎ¯Î¿ Î¼Îµ ÏÎ·Î½ ÎµÎ½ÏÎ¿Î»Î® `tar -xf "
+"[TB archive]` Î® ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÏÎ½ÏÎ±Ï ÎÎ½Î±Î½ 
Î´Î¹Î±ÏÎµÎ¹ÏÎ¹ÏÏÎ® Î±ÏÏÎµÎ¯ÏÎ½."
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
@@ -495,11 +501,13 @@ msgid ""
 "5. You'll need to tell your GNU/Linux that you want the ability to execute "
 "shell scripts from the graphical interface."
 msgstr ""
+"5. ÎÎ± ÏÏÎÏÎµÎ¹ Î½Î± ÏÎµÎ¯ÏÎµ ÏÏÎ¿ GNU/Linux ÏÎ±Ï ÏÏÎ¹ 
Î¸ÎÎ»ÎµÏÎµ Î½Î± ÎµÎºÏÎµÎ»ÎÏÎµÏÎµ Î´ÎÏÎ¼ÎµÏ "
+"ÎµÎ½ÎµÏÎ³ÎµÎ¹ÏÎ½ shell Î±ÏÏ ÏÎ· Î³ÏÎ±ÏÎ¹ÎºÎ® Î´Î¹ÎµÏÎ±ÏÎ®."
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
 msgid "Navigate to the newly extracted Tor Browser directory."
-msgstr ""
+msgstr "Î Î»Î¿Î·Î³Î·Î¸ÎµÎ¯ÏÎµ ÏÏÎ¿Î½ ÏÏÏÏÏÎ±ÏÎ± ÎµÎ¾Î±Î³Î¼ÎÎ½Î¿ 
ÎºÎ±ÏÎ¬Î»Î¿Î³Î¿ ÏÎ¿Ï Tor Browser."
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
@@ -507,11 +515,16 @@ msgid ""
 "Right click on `start-tor-browser.desktop`, open Properties or Preferences "
 "and change the permission to allow executing file as program."
 msgstr ""
+"ÎÎ¬Î½ÏÎµ Î´ÎµÎ¾Î¯ ÎºÎ»Î¹Îº ÏÏÎ¿ `start-tor-browser.desktop`, 
Î±Î½Î¿Î¯Î¾ÏÎµ ÏÎ¹Ï ÎÎ´Î¹ÏÏÎ·ÏÎµÏ Î® ÏÎ¹Ï"
+" Î ÏÎ¿ÏÎ¹Î¼Î®ÏÎµÎ¹Ï ÎºÎ±Î¹ Î±Î»Î»Î¬Î¾ÏÎµ ÏÎ·Î½ Î¬Î´ÎµÎ¹Î± Î³Î¹Î± Î½Î± 
ÎµÏÎ¹ÏÏÎÏÎµÏÎµ ÏÎ·Î½ ÎµÎºÏÎÎ»ÎµÏÎ· ÏÎ¿Ï "
+"Î±ÏÏÎµÎ¯Î¿Ï ÏÏ ÏÏÎ¿Î³ÏÎ¬Î¼Î¼Î±ÏÎ¿Ï."
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
 msgid "Double-click the icon to start up Tor Browser for the first time."
 msgstr ""
+"ÎÎ¬Î½ÏÎµ Î´Î¹ÏÎ»Ï ÎºÎ»Î¹Îº ÏÏÎ¿ ÎµÎ¹ÎºÎ¿Î½Î¯Î´Î¹Î¿ Î³Î¹Î± Î½Î± 
ÎµÎºÏÎµÎ»ÎÏÎµÏÎµ ÏÎ¿ Tor Browser Î³Î¹Î± ÏÏÏÏÎ· "
+"ÏÎ¿ÏÎ¬."
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
@@ -519,11 +532,13 @@ msgid ""
 "6. Alternatively, from inside the Tor Browser directory, you can also start "
 "from the command line by running:"
 msgstr ""
+"6. ÎÎ½Î±Î»Î»Î±ÎºÏÎ¹ÎºÎ¬, Î¼ÎÏÎ± Î±ÏÏ ÏÎ¿Î½ ÎºÎ±ÏÎ¬Î»Î¿Î³Î¿ ÏÎ¿Ï Tor 
Browser Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ ÎµÏÎ¯ÏÎ·Ï Î½Î± "
+"Î¾ÎµÎºÎ¹Î½Î®ÏÎµÏÎµ Î±ÏÏ ÏÎ· Î³ÏÎ±Î¼Î¼Î® ÎµÎ½ÏÎ¿Î»ÏÎ½ 
ÎµÎºÏÎµÎ»ÏÎ½ÏÎ±Ï:"
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
 msgid "`./start-tor-browser`"
-msgstr ""
+msgstr "`./start-tor-browser`"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.title)
@@ -739,6 +754,10 @@ msgid ""
 "bridges by Internet scanning. obfs4 bridges are less likely to be blocked "
 "than its predecessor, obfs3 bridges."
 msgstr ""
+"Î obfs4 ÎºÎ¬Î½ÎµÎ¹ ÏÎ·Î½ ÎºÎ¯Î½Î·ÏÎ· ÏÎ¿Ï Tor Î½Î± Î¼Î¿Î¹Î¬Î¶ÎµÎ¹ ÏÏ
ÏÎ±Î¯Î± ÏÏÏÏ Î¿ obfs3 ÎºÎ±Î¹ "
+"ÏÎ±ÏÏÏÏÏÎ¿Î½Î± Î´ÎµÎ½ ÎµÏÎ¹ÏÏÎÏÎµÎ¹ ÏÎµ Î»Î¿Î³Î¿ÎºÏÎ¹ÏÎÏ Î½Î± 
Î²ÏÎ¯ÏÎºÎ¿ÏÎ½ ÏÎ¹Ï Î³ÎÏÏÏÎµÏ ÏÎºÎ±Î½Î¬ÏÎ¿Î½ÏÎ±Ï "
+"ÏÎ¿ Î´Î¹Î±Î´Î¯ÎºÏÏÎ¿. ÎÎ¹ Î³ÎÏÏÏÎµÏ ÏÎ¿Ï obfs4 ÎµÎ¯Î½Î±Î¹ ÏÎ¿Î»Ï 
Î»Î¹Î³ÏÏÎµÏÎ¿ ÏÎ¹Î¸Î±Î½Ï

[tor-commits] [tor/master] Correction to changelog from dgoulet

2020-02-10 Thread nickm

commit dcbf6611d998095364f670e26106019fc3e098d2
Author: Nick Mathewson 
Date:   Mon Feb 10 15:02:32 2020 -0500

Correction to changelog from dgoulet
---
 ChangeLog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9e0725537..b5dc9f692 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,7 +53,8 @@ Changes in version 0.4.3.2-alpha - 2020-02-10
   o Minor bugfixes (onion service v3, client authorization):
 - When removing client authorization credentials using the control
   port, also remove the associated descriptor, so the onion service
-  can still be contacted. Fixes bug 33148; bugfix on 0.4.3.1-alpha.
+  can no longer be contacted. Fixes bug 33148; bugfix
+  on 0.4.3.1-alpha.
 
   o Minor bugfixes (pluggable transports):
 - When receiving a message on standard error from a pluggable

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

[tor-commits] [tor/master] Light edits on the 0.4.3.2-alpha changelog

2020-02-10 Thread nickm

commit f275a9ada78b0c011209c12b89ce560931f49279
Author: Nick Mathewson 
Date:   Mon Feb 10 14:40:19 2020 -0500

Light edits on the 0.4.3.2-alpha changelog
---
 ChangeLog | 42 +-
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e4779a900..1f8fbb1ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,10 +4,10 @@ Changes in version 0.4.3.2-alpha - 2020-02-10
   running the previous alpha should upgrade, and look for bugs in this
   one instead.
 
-  o Major bugfixes (Onion service client, authorization):
-- On a NEWNYM signal, purge the ephemeral client authorization
-  cache. The permanent ones are kept. Fixes bug 33139; bugfix
-  on 0.4.3.1-alpha.
+  o Major bugfixes (onion service client, authorization):
+- On a NEWNYM signal, purge entries from the ephemeral client
+  authorization cache. The permanent ones are kept. Fixes bug 33139;
+  bugfix on 0.4.3.1-alpha.
 
   o Minor features (best practices tracker):
 - Practracker now supports a --regen-overbroad option to regenerate
@@ -15,14 +15,15 @@ Changes in version 0.4.3.2-alpha - 2020-02-10
   tolerant of best-practices violations. Closes ticket 32372.
 
   o Minor features (continuous integration):
-- Run Doxygen Makefile target on Travis. Closes ticket 32455.
+- Run Doxygen Makefile target on Travis, so we can learn about
+  regressions in our internal documentation. Closes ticket 32455.
 - Stop allowing failures on the Travis CI stem tests job. It looks
   like all the stem hangs we were seeing before are now fixed.
   Closes ticket 33075.
 
   o Minor bugfixes (build system):
-- Some configure options were either missing or incorrect in the
-  configure summary. Fixes bug 32230; bugfix on 0.4.3.1-alpha.
+- Revise configure options that were either missing or incorrect in
+  the configure summary. Fixes bug 32230; bugfix on 0.4.3.1-alpha.
 
   o Minor bugfixes (controller protocol):
 - Fix a memory leak introduced by refactoring of control reply
@@ -30,8 +31,8 @@ Changes in version 0.4.3.2-alpha - 2020-02-10
 - Fix a memory leak in GETINFO responses. Fixes bug 33103; bugfix
   on 0.4.3.1-alpha.
 - When receiving "ACTIVE" or "DORMANT" signals on the control port,
-  report them as SIGNAL events. Fixes bug 33104; bugfix
-  on 0.4.0.1-alpha.
+  report them as SIGNAL events. Previously we would log a bug
+  warning. Fixes bug 33104; bugfix on 0.4.0.1-alpha.
 
   o Minor bugfixes (logging):
 - If we encounter a bug when flushing a buffer to a TLS connection,
@@ -40,32 +41,31 @@ Changes in version 0.4.3.2-alpha - 2020-02-10
   us to run out of disk space. Fixes bug 33093; bugfix
   on 0.3.2.2-alpha.
 - When logging a bug, do not say "Future instances of this warning
-  will be silenced" unless we are actually going to do so.
+  will be silenced" unless we are actually going to silence them.
   Previously we would say this whenever a BUG() check failed in the
   code. Fixes bug 33095; bugfix on 0.4.1.1-alpha.
 
   o Minor bugfixes (onion service v2):
-- Move a series of warnings to protocol warning level because they
-  can all be triggered remotely by a malformed request. Fixes bug
-  32706; bugfix on 0.1.1.14-alpha.
+- Move a series of v2 onion service warnings to protocol-warning
+  level because they can all be triggered remotely by a malformed
+  request. Fixes bug 32706; bugfix on 0.1.1.14-alpha.
 
   o Minor bugfixes (onion service v3, client authorization):
 - When removing client authorization credentials using the control
-  port, also remove the associated descriptor so they don't linger
-  and are still usable hence making the onion service behind client
-  authorization reachable. Fixes bug 33148; bugfix on 0.4.3.1-alpha.
+  port, also remove the associated descriptor, so the onion service
+  can still be contacted. Fixes bug 33148; bugfix on 0.4.3.1-alpha.
 
   o Minor bugfixes (pluggable transports):
 - Lower the log level of standard error messages from a PT from
   warning to info. Fixes bug 33005; bugfix on 0.4.0.1-alpha.
 
   o Minor bugfixes (rust, build):
-- Fix a syntax warning given by newer versions of Rust, and creating
-  problems for our continuous integration. Fixes bug 33212; bugfix
-  on 0.3.5.1-alpha.
+- Fix a syntax warning given by newer versions of Rust that was
+  creating problems for our continuous integration. Fixes bug 33212;
+  bugfix on 0.3.5.1-alpha.
 
   o Minor bugfixes (TLS bug handling):
-- When encountering a bug in buf_read_freom_tls(), return a "MISC"
+- When encountering a bug in buf_read_from_tls(), return a "MISC"
   error code rather than "WANTWRITE". This change might help avoid
   some CPU-wasting loops if the bug is ever triggered. Bug reported
   by opara. Fixes bug 32673; bugfix on

[tor-commits] [tor/master] One more light changelog edit.

2020-02-10 Thread nickm

commit 2571d8e7fe173a756e29b036636fbf31c1beb71a
Author: Nick Mathewson 
Date:   Mon Feb 10 15:01:02 2020 -0500

One more light changelog edit.
---
 ChangeLog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1f8fbb1ed..9e0725537 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,8 +56,9 @@ Changes in version 0.4.3.2-alpha - 2020-02-10
   can still be contacted. Fixes bug 33148; bugfix on 0.4.3.1-alpha.
 
   o Minor bugfixes (pluggable transports):
-- Lower the log level of standard error messages from a PT from
-  warning to info. Fixes bug 33005; bugfix on 0.4.0.1-alpha.
+- When receiving a message on standard error from a pluggable
+  transport, log it at info level, rather than as a warning. Fixes
+  bug 33005; bugfix on 0.4.0.1-alpha.
 
   o Minor bugfixes (rust, build):
 - Fix a syntax warning given by newer versions of Rust that was

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

[tor-commits] [tor/master] start on 0.4.3.2-alpha changelog

2020-02-10 Thread nickm

commit a0ca442b79306eaa9907ad069be85a9d4b640f7d
Author: Nick Mathewson 
Date:   Mon Feb 10 14:30:36 2020 -0500

start on 0.4.3.2-alpha changelog
---
 ChangeLog| 82 
 changes/bug32673 |  5 ---
 changes/bug33005 |  3 --
 changes/bug33093_logging |  5 ---
 changes/bug33095_041 |  5 ---
 changes/bug33104 |  4 ---
 changes/ticket32230  |  3 --
 changes/ticket32372  |  4 ---
 changes/ticket32455  |  2 --
 changes/ticket32706  |  4 ---
 changes/ticket32928  |  7 -
 changes/ticket33039  |  3 --
 changes/ticket33075  |  4 ---
 changes/ticket33091  |  3 --
 changes/ticket33103  |  3 --
 changes/ticket33139  |  3 --
 changes/ticket33148  |  5 ---
 changes/ticket33212  |  4 ---
 18 files changed, 82 insertions(+), 67 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3d05bea86..e4779a900 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,85 @@
+Changes in version 0.4.3.2-alpha - 2020-02-10
+  This is the second stable alpha release in the Tor 0.4.3.x series. It
+  fixes several bugs present in the previous alpha release. Anybody
+  running the previous alpha should upgrade, and look for bugs in this
+  one instead.
+
+  o Major bugfixes (Onion service client, authorization):
+- On a NEWNYM signal, purge the ephemeral client authorization
+  cache. The permanent ones are kept. Fixes bug 33139; bugfix
+  on 0.4.3.1-alpha.
+
+  o Minor features (best practices tracker):
+- Practracker now supports a --regen-overbroad option to regenerate
+  the exceptions file, but only to revise exceptions to be _less_
+  tolerant of best-practices violations. Closes ticket 32372.
+
+  o Minor features (continuous integration):
+- Run Doxygen Makefile target on Travis. Closes ticket 32455.
+- Stop allowing failures on the Travis CI stem tests job. It looks
+  like all the stem hangs we were seeing before are now fixed.
+  Closes ticket 33075.
+
+  o Minor bugfixes (build system):
+- Some configure options were either missing or incorrect in the
+  configure summary. Fixes bug 32230; bugfix on 0.4.3.1-alpha.
+
+  o Minor bugfixes (controller protocol):
+- Fix a memory leak introduced by refactoring of control reply
+  formatting code. Fixes bug 33039; bugfix on 0.4.3.1-alpha.
+- Fix a memory leak in GETINFO responses. Fixes bug 33103; bugfix
+  on 0.4.3.1-alpha.
+- When receiving "ACTIVE" or "DORMANT" signals on the control port,
+  report them as SIGNAL events. Fixes bug 33104; bugfix
+  on 0.4.0.1-alpha.
+
+  o Minor bugfixes (logging):
+- If we encounter a bug when flushing a buffer to a TLS connection,
+  only log the bug once per invocation of the Tor process.
+  Previously we would log with every occurrence, which could cause
+  us to run out of disk space. Fixes bug 33093; bugfix
+  on 0.3.2.2-alpha.
+- When logging a bug, do not say "Future instances of this warning
+  will be silenced" unless we are actually going to do so.
+  Previously we would say this whenever a BUG() check failed in the
+  code. Fixes bug 33095; bugfix on 0.4.1.1-alpha.
+
+  o Minor bugfixes (onion service v2):
+- Move a series of warnings to protocol warning level because they
+  can all be triggered remotely by a malformed request. Fixes bug
+  32706; bugfix on 0.1.1.14-alpha.
+
+  o Minor bugfixes (onion service v3, client authorization):
+- When removing client authorization credentials using the control
+  port, also remove the associated descriptor so they don't linger
+  and are still usable hence making the onion service behind client
+  authorization reachable. Fixes bug 33148; bugfix on 0.4.3.1-alpha.
+
+  o Minor bugfixes (pluggable transports):
+- Lower the log level of standard error messages from a PT from
+  warning to info. Fixes bug 33005; bugfix on 0.4.0.1-alpha.
+
+  o Minor bugfixes (rust, build):
+- Fix a syntax warning given by newer versions of Rust, and creating
+  problems for our continuous integration. Fixes bug 33212; bugfix
+  on 0.3.5.1-alpha.
+
+  o Minor bugfixes (TLS bug handling):
+- When encountering a bug in buf_read_freom_tls(), return a "MISC"
+  error code rather than "WANTWRITE". This change might help avoid
+  some CPU-wasting loops if the bug is ever triggered. Bug reported
+  by opara. Fixes bug 32673; bugfix on 0.3.0.4-alpha.
+
+  o Code simplification and refactoring (mainloop):
+- Simplify the ip_address_changed() function by removing redundant
+  checks. Closes ticket 33091.
+
+  o Documentation (manpage):
+- Split Circuit Timeout options and Node Selection options into
+  their own sections of the tor manpage. Closes tickets 32928 and
+  32929. Work by Swati Thacker as part of Google Season of Docs.
+
+
 Changes in version 0.4.2.6 - 2020-01-30
   This is the second

[tor-commits] [tor/master] Add tests for control_event_signal.

2020-02-10 Thread nickm

commit b2c3cb1b26c41969776ed1fd1b20588430346e45
Author: Nick Mathewson 
Date:   Mon Feb 10 11:38:36 2020 -0500

Add tests for control_event_signal.
---
 src/test/test_controller_events.c | 39 +++
 1 file changed, 39 insertions(+)

diff --git a/src/test/test_controller_events.c 
b/src/test/test_controller_events.c
index 910aacace..5b108ab31 100644
--- a/src/test/test_controller_events.c
+++ b/src/test/test_controller_events.c
@@ -16,6 +16,7 @@
 #include "core/mainloop/connection.h"
 #include "feature/control/control_events.h"
 #include "test/test.h"
+#include "test/log_test_helpers.h"
 
 #include "core/or/or_circuit_st.h"
 #include "core/or/origin_circuit_st.h"
@@ -394,6 +395,43 @@ test_cntev_dirboot_defer_orconn(void *arg)
 }
 
 static void
+test_cntev_signal(void *arg)
+{
+  (void)arg;
+  int rv;
+
+  MOCK(queue_control_event_string, mock_queue_control_event_string);
+
+  /* Nothing is listening for signals, so no event should be queued. */
+  rv = control_event_signal(SIGHUP);
+  tt_int_op(0, OP_EQ, rv);
+  tt_ptr_op(saved_event_str, OP_EQ, NULL);
+
+  /* Now try with signals included in the event mask. */
+  control_testing_set_global_event_mask(EVENT_MASK_(EVENT_GOT_SIGNAL));
+  rv = control_event_signal(SIGHUP);
+  tt_int_op(0, OP_EQ, rv);
+  tt_str_op(saved_event_str, OP_EQ, "650 SIGNAL RELOAD\r\n");
+
+  rv = control_event_signal(SIGACTIVE);
+  tt_int_op(0, OP_EQ, rv);
+  tt_str_op(saved_event_str, OP_EQ, "650 SIGNAL ACTIVE\r\n");
+
+  /* Try a signal that doesn't exist. */
+  setup_full_capture_of_logs(LOG_WARN);
+  tor_free(saved_event_str);
+  rv = control_event_signal(9);
+  tt_int_op(-1, OP_EQ, rv);
+  tt_ptr_op(saved_event_str, OP_EQ, NULL);
+  expect_single_log_msg_containing("Unrecognized signal 9");
+
+ done:
+  tor_free(saved_event_str);
+ teardown_capture_of_logs();
+  UNMOCK(queue_control_event_string);
+}
+
+static void
 setup_orconn_state(orconn_event_msg_t *msg, uint64_t gid, uint64_t chan,
int proxy_type)
 {
@@ -541,6 +579,7 @@ struct testcase_t controller_event_tests[] = {
   TEST(event_mask, TT_FORK),
   TEST(dirboot_defer_desc, TT_FORK),
   TEST(dirboot_defer_orconn, TT_FORK),
+  TEST(signal, TT_FORK),
   TEST(orconn_state, TT_FORK),
   TEST(orconn_state_pt, TT_FORK),
   TEST(orconn_state_proxy, TT_FORK),



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

[tor-commits] [tor/master] Rewrite control_event_signal() to use signal_table.

2020-02-10 Thread nickm

commit 7bd671811ec38e8126ffc17cb922f2397c572cda
Author: Nick Mathewson 
Date:   Thu Jan 30 09:29:07 2020 -0500

Rewrite control_event_signal() to use signal_table.

When we added the ACTIVE and DORMANT virtual signals, we taught the
signal command to handle them, but we didn't teach SIGNAL event to
report them.

To solve this problem and prevent it from recurring, this patch
revises the implementation of control_event_signal() to use the same
signal_table that handle_control_signal() uses.  This way, the two
controller commands can't become out of sync.

Fixes bug 33104; bugfix on 0.4.0.1-alpha.
---
 changes/bug33104 |  4 
 src/feature/control/control.c|  4 
 src/feature/control/control_events.c | 32 ++--
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/changes/bug33104 b/changes/bug33104
new file mode 100644
index 0..b5478df10
--- /dev/null
+++ b/changes/bug33104
@@ -0,0 +1,4 @@
+  o Minor bugfixes (controller):
+- When receiving "ACTIVE" or "DORMANT" signals on the control port,
+  report them as SIGNAL events. Fixes bug 33104; bugfix on
+  0.4.0.1-alpha.
diff --git a/src/feature/control/control.c b/src/feature/control/control.c
index 436bf423c..71b864751 100644
--- a/src/feature/control/control.c
+++ b/src/feature/control/control.c
@@ -158,6 +158,10 @@ control_ports_write_to_file(void)
 }
 
 const struct signal_name_t signal_table[] = {
+  /* NOTE: this table is used for handling SIGNAL commands and generating
+   * SIGNAL events.  Order is significant: if there are two entries for the
+   * same numeric signal, the first one is the canonical name generated
+   * for the events. */
   { SIGHUP, "RELOAD" },
   { SIGHUP, "HUP" },
   { SIGINT, "SHUTDOWN" },
diff --git a/src/feature/control/control_events.c 
b/src/feature/control/control_events.c
index 9e0966ca5..1089b608b 100644
--- a/src/feature/control/control_events.c
+++ b/src/feature/control/control_events.c
@@ -1552,29 +1552,17 @@ control_event_signal(uintptr_t signal_num)
   if (!control_event_is_interesting(EVENT_GOT_SIGNAL))
 return 0;
 
-  switch (signal_num) {
-case SIGHUP:
-  signal_string = "RELOAD";
+  for (unsigned i = 0; signal_table[i].signal_name != NULL; ++i) {
+if ((int)signal_num == signal_table[i].sig) {
+  signal_string = signal_table[i].signal_name;
   break;
-case SIGUSR1:
-  signal_string = "DUMP";
-  break;
-case SIGUSR2:
-  signal_string = "DEBUG";
-  break;
-case SIGNEWNYM:
-  signal_string = "NEWNYM";
-  break;
-case SIGCLEARDNSCACHE:
-  signal_string = "CLEARDNSCACHE";
-  break;
-case SIGHEARTBEAT:
-  signal_string = "HEARTBEAT";
-  break;
-default:
-  log_warn(LD_BUG, "Unrecognized signal %lu in control_event_signal",
-   (unsigned long)signal_num);
-  return -1;
+}
+  }
+
+  if (signal_string == NULL) {
+log_warn(LD_BUG, "Unrecognized signal %lu in control_event_signal",
+ (unsigned long)signal_num);
+return -1;
   }
 
   send_control_event(EVENT_GOT_SIGNAL,  "650 SIGNAL %s\r\n",



___
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 'bug33104_041'

2020-02-10 Thread nickm

commit eb8841cd9553d1bd7804018963abacf93a088f74
Merge: d9144700a b2c3cb1b2
Author: Nick Mathewson 
Date:   Mon Feb 10 14:23:13 2020 -0500

Merge branch 'bug33104_041'

 changes/bug33104 |  4 
 src/feature/control/control.c|  4 
 src/feature/control/control_events.c | 32 +
 src/test/test_controller_events.c| 39 
 4 files changed, 57 insertions(+), 22 deletions(-)

diff --cc src/test/test_controller_events.c
index e9d09fbee,5b108ab31..60dfbd630
--- a/src/test/test_controller_events.c
+++ b/src/test/test_controller_events.c
@@@ -16,14 -15,11 +16,15 @@@
  #include "core/or/orconn_event.h"
  #include "core/mainloop/connection.h"
  #include "feature/control/control_events.h"
 +#include "feature/control/control_fmt.h"
  #include "test/test.h"
 +#include "test/test_helpers.h"
+ #include "test/log_test_helpers.h"
  
 +#include "core/or/entry_connection_st.h"
  #include "core/or/or_circuit_st.h"
  #include "core/or/origin_circuit_st.h"
 +#include "core/or/socks_request_st.h"
  
  static void
  add_testing_cell_stats_entry(circuit_t *circ, uint8_t command,
@@@ -399,12 -395,50 +400,49 @@@ test_cntev_dirboot_defer_orconn(void *a
  }
  
  static void
+ test_cntev_signal(void *arg)
+ {
+   (void)arg;
+   int rv;
+ 
+   MOCK(queue_control_event_string, mock_queue_control_event_string);
+ 
+   /* Nothing is listening for signals, so no event should be queued. */
+   rv = control_event_signal(SIGHUP);
+   tt_int_op(0, OP_EQ, rv);
+   tt_ptr_op(saved_event_str, OP_EQ, NULL);
+ 
+   /* Now try with signals included in the event mask. */
+   control_testing_set_global_event_mask(EVENT_MASK_(EVENT_GOT_SIGNAL));
+   rv = control_event_signal(SIGHUP);
+   tt_int_op(0, OP_EQ, rv);
+   tt_str_op(saved_event_str, OP_EQ, "650 SIGNAL RELOAD\r\n");
+ 
+   rv = control_event_signal(SIGACTIVE);
+   tt_int_op(0, OP_EQ, rv);
+   tt_str_op(saved_event_str, OP_EQ, "650 SIGNAL ACTIVE\r\n");
+ 
+   /* Try a signal that doesn't exist. */
+   setup_full_capture_of_logs(LOG_WARN);
+   tor_free(saved_event_str);
+   rv = control_event_signal(9);
+   tt_int_op(-1, OP_EQ, rv);
+   tt_ptr_op(saved_event_str, OP_EQ, NULL);
+   expect_single_log_msg_containing("Unrecognized signal 9");
+ 
+  done:
+   tor_free(saved_event_str);
+  teardown_capture_of_logs();
+   UNMOCK(queue_control_event_string);
+ }
+ 
+ static void
 -setup_orconn_state(orconn_event_msg_t *msg, uint64_t gid, uint64_t chan,
 +setup_orconn_state(orconn_state_msg_t *msg, uint64_t gid, uint64_t chan,
 int proxy_type)
  {
 -  msg->type = ORCONN_MSGTYPE_STATE;
 -  msg->u.state.gid = gid;
 -  msg->u.state.chan = chan;
 -  msg->u.state.proxy_type = proxy_type;
 +  msg->gid = gid;
 +  msg->chan = chan;
 +  msg->proxy_type = proxy_type;
  }
  
  static void
@@@ -678,11 -577,11 +716,12 @@@ struct testcase_t controller_event_test
TEST(append_cell_stats, TT_FORK),
TEST(format_cell_stats, TT_FORK),
TEST(event_mask, TT_FORK),
 -  TEST(dirboot_defer_desc, TT_FORK),
 -  TEST(dirboot_defer_orconn, TT_FORK),
 +  TEST(format_stream, TT_FORK),
+   TEST(signal, TT_FORK),
 -  TEST(orconn_state, TT_FORK),
 -  TEST(orconn_state_pt, TT_FORK),
 -  TEST(orconn_state_proxy, TT_FORK),
 +  T_PUBSUB(dirboot_defer_desc, TT_FORK),
 +  T_PUBSUB(dirboot_defer_orconn, TT_FORK),
 +  T_PUBSUB(orconn_state, TT_FORK),
 +  T_PUBSUB(orconn_state_pt, TT_FORK),
 +  T_PUBSUB(orconn_state_proxy, TT_FORK),
END_OF_TESTCASES
  };

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

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

2020-02-10 Thread nickm

commit 0c90fc37ec7fcee01db6bc5e0784e759a7ec954c
Merge: c5e610af0 71c49f735
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:10 2020 -0500

Merge branch 'maint-0.4.1' into maint-0.4.2

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.5' into maint-0.4.0

2020-02-10 Thread nickm

commit f3fa22bf1b52dfce65a37e6a84bac8635916e8c2
Merge: 65825018c 2b6df3da2
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:09 2020 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.0] Fix a Rust compilation warning; resolve bug 33212.

2020-02-10 Thread nickm

commit 99d044d553c08d3b2900dbca30199083067515b2
Author: Nick Mathewson 
Date:   Mon Feb 10 13:32:09 2020 -0500

Fix a Rust compilation warning; resolve bug 33212.
---
 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/ticket33212 b/changes/ticket33212
new file mode 100644
index 0..aeb09e0c6
--- /dev/null
+++ b/changes/ticket33212
@@ -0,0 +1,4 @@
+  o Minor bugfixes (rust, build):
+- Fix a syntax warning given by newer versions of Rust, and creating
+  problems for our continuous integration.
+  Fixes bug 33212; bugfix on 0.3.5.1-alpha.
diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs
index 2661d811c..06fdf56c6 100644
--- a/src/rust/protover/protover.rs
+++ b/src/rust/protover/protover.rs
@@ -26,7 +26,7 @@ const FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS: &'static str 
= "0.2.9.3-alpha";
 /// before concluding that someone is trying to DoS us
 ///
 /// C_RUST_COUPLED: protover.c `MAX_PROTOCOLS_TO_EXPAND`
-const MAX_PROTOCOLS_TO_EXPAND: usize = (1 << 16);
+const MAX_PROTOCOLS_TO_EXPAND: usize = 1 << 16;
 
 /// The maximum size an `UnknownProtocol`'s name may be.
 pub(crate) const MAX_PROTOCOL_NAME_LENGTH: usize = 100;



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

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

2020-02-10 Thread nickm

commit f8ff2f12d48ede0186f4c921d773bc51d82128e1
Merge: b8bfea163 0c90fc37e
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:10 2020 -0500

Merge branch 'maint-0.4.2' into release-0.4.2

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.5] Fix a Rust compilation warning; resolve bug 33212.

2020-02-10 Thread nickm

commit 99d044d553c08d3b2900dbca30199083067515b2
Author: Nick Mathewson 
Date:   Mon Feb 10 13:32:09 2020 -0500

Fix a Rust compilation warning; resolve bug 33212.
---
 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/ticket33212 b/changes/ticket33212
new file mode 100644
index 0..aeb09e0c6
--- /dev/null
+++ b/changes/ticket33212
@@ -0,0 +1,4 @@
+  o Minor bugfixes (rust, build):
+- Fix a syntax warning given by newer versions of Rust, and creating
+  problems for our continuous integration.
+  Fixes bug 33212; bugfix on 0.3.5.1-alpha.
diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs
index 2661d811c..06fdf56c6 100644
--- a/src/rust/protover/protover.rs
+++ b/src/rust/protover/protover.rs
@@ -26,7 +26,7 @@ const FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS: &'static str 
= "0.2.9.3-alpha";
 /// before concluding that someone is trying to DoS us
 ///
 /// C_RUST_COUPLED: protover.c `MAX_PROTOCOLS_TO_EXPAND`
-const MAX_PROTOCOLS_TO_EXPAND: usize = (1 << 16);
+const MAX_PROTOCOLS_TO_EXPAND: usize = 1 << 16;
 
 /// The maximum size an `UnknownProtocol`'s name may be.
 pub(crate) const MAX_PROTOCOL_NAME_LENGTH: usize = 100;



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

[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0

2020-02-10 Thread nickm

commit f3fa22bf1b52dfce65a37e6a84bac8635916e8c2
Merge: 65825018c 2b6df3da2
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:09 2020 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.2] Fix a Rust compilation warning; resolve bug 33212.

2020-02-10 Thread nickm

commit 99d044d553c08d3b2900dbca30199083067515b2
Author: Nick Mathewson 
Date:   Mon Feb 10 13:32:09 2020 -0500

Fix a Rust compilation warning; resolve bug 33212.
---
 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/ticket33212 b/changes/ticket33212
new file mode 100644
index 0..aeb09e0c6
--- /dev/null
+++ b/changes/ticket33212
@@ -0,0 +1,4 @@
+  o Minor bugfixes (rust, build):
+- Fix a syntax warning given by newer versions of Rust, and creating
+  problems for our continuous integration.
+  Fixes bug 33212; bugfix on 0.3.5.1-alpha.
diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs
index 2661d811c..06fdf56c6 100644
--- a/src/rust/protover/protover.rs
+++ b/src/rust/protover/protover.rs
@@ -26,7 +26,7 @@ const FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS: &'static str 
= "0.2.9.3-alpha";
 /// before concluding that someone is trying to DoS us
 ///
 /// C_RUST_COUPLED: protover.c `MAX_PROTOCOLS_TO_EXPAND`
-const MAX_PROTOCOLS_TO_EXPAND: usize = (1 << 16);
+const MAX_PROTOCOLS_TO_EXPAND: usize = 1 << 16;
 
 /// The maximum size an `UnknownProtocol`'s name may be.
 pub(crate) const MAX_PROTOCOL_NAME_LENGTH: usize = 100;



___
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 'bug33212_035' into maint-0.3.5

2020-02-10 Thread nickm

commit 2b6df3da21803519c262099ab9dd950271f3ce11
Merge: 41d52e9cd 99d044d55
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:03 2020 -0500

Merge branch 'bug33212_035' into maint-0.3.5

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.0' into maint-0.4.1

2020-02-10 Thread nickm

commit 71c49f735636d626abaa13222aa14e7c97f73393
Merge: 7afb95d3e f3fa22bf1
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:10 2020 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.2] Merge branch 'maint-0.4.0' into maint-0.4.1

2020-02-10 Thread nickm

commit 71c49f735636d626abaa13222aa14e7c97f73393
Merge: 7afb95d3e f3fa22bf1
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:10 2020 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.5] Merge branch 'maint-0.3.5' into release-0.3.5

2020-02-10 Thread nickm

commit ec454830e71170bf2ed2c84bcdfb9037f64dc136
Merge: c3e300dc9 2b6df3da2
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:09 2020 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.1' into maint-0.4.2

2020-02-10 Thread nickm

commit 0c90fc37ec7fcee01db6bc5e0784e759a7ec954c
Merge: c5e610af0 71c49f735
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:10 2020 -0500

Merge branch 'maint-0.4.1' into maint-0.4.2

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.0] Merge branch 'bug33212_035' into maint-0.3.5

2020-02-10 Thread nickm

commit 2b6df3da21803519c262099ab9dd950271f3ce11
Merge: 41d52e9cd 99d044d55
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:03 2020 -0500

Merge branch 'bug33212_035' into maint-0.3.5

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.1] Merge branch 'bug33212_035' into maint-0.3.5

2020-02-10 Thread nickm

commit 2b6df3da21803519c262099ab9dd950271f3ce11
Merge: 41d52e9cd 99d044d55
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:03 2020 -0500

Merge branch 'bug33212_035' into maint-0.3.5

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.2] Merge branch 'maint-0.3.5' into maint-0.4.0

2020-02-10 Thread nickm

commit f3fa22bf1b52dfce65a37e6a84bac8635916e8c2
Merge: 65825018c 2b6df3da2
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:09 2020 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.2'

2020-02-10 Thread nickm

commit d9144700af5602cc267c0d147145c100567fdbb3
Merge: dab0b1c3a 0c90fc37e
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:10 2020 -0500

Merge branch 'maint-0.4.2'

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.1] Merge branch 'maint-0.4.1' into release-0.4.1

2020-02-10 Thread nickm

commit d2cbefbb8f26a17742629251023e786f12a6f555
Merge: 06df2f51d 71c49f735
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:10 2020 -0500

Merge branch 'maint-0.4.1' into release-0.4.1

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2

2020-02-10 Thread nickm

commit 0c90fc37ec7fcee01db6bc5e0784e759a7ec954c
Merge: c5e610af0 71c49f735
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:10 2020 -0500

Merge branch 'maint-0.4.1' into maint-0.4.2

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0

2020-02-10 Thread nickm

commit f3fa22bf1b52dfce65a37e6a84bac8635916e8c2
Merge: 65825018c 2b6df3da2
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:09 2020 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.1] Fix a Rust compilation warning; resolve bug 33212.

2020-02-10 Thread nickm

commit 99d044d553c08d3b2900dbca30199083067515b2
Author: Nick Mathewson 
Date:   Mon Feb 10 13:32:09 2020 -0500

Fix a Rust compilation warning; resolve bug 33212.
---
 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/ticket33212 b/changes/ticket33212
new file mode 100644
index 0..aeb09e0c6
--- /dev/null
+++ b/changes/ticket33212
@@ -0,0 +1,4 @@
+  o Minor bugfixes (rust, build):
+- Fix a syntax warning given by newer versions of Rust, and creating
+  problems for our continuous integration.
+  Fixes bug 33212; bugfix on 0.3.5.1-alpha.
diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs
index 2661d811c..06fdf56c6 100644
--- a/src/rust/protover/protover.rs
+++ b/src/rust/protover/protover.rs
@@ -26,7 +26,7 @@ const FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS: &'static str 
= "0.2.9.3-alpha";
 /// before concluding that someone is trying to DoS us
 ///
 /// C_RUST_COUPLED: protover.c `MAX_PROTOCOLS_TO_EXPAND`
-const MAX_PROTOCOLS_TO_EXPAND: usize = (1 << 16);
+const MAX_PROTOCOLS_TO_EXPAND: usize = 1 << 16;
 
 /// The maximum size an `UnknownProtocol`'s name may be.
 pub(crate) const MAX_PROTOCOL_NAME_LENGTH: usize = 100;



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

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

2020-02-10 Thread nickm

commit ed2cbbf71680fd2be67eb7b74c44572e58895d72
Merge: d0d2aba9f f3fa22bf1
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:09 2020 -0500

Merge branch 'maint-0.4.0' into release-0.4.0

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.5] Merge branch 'bug33212_035' into maint-0.3.5

2020-02-10 Thread nickm

commit 2b6df3da21803519c262099ab9dd950271f3ce11
Merge: 41d52e9cd 99d044d55
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:03 2020 -0500

Merge branch 'bug33212_035' into maint-0.3.5

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.2] Merge branch 'bug33212_035' into maint-0.3.5

2020-02-10 Thread nickm

commit 2b6df3da21803519c262099ab9dd950271f3ce11
Merge: 41d52e9cd 99d044d55
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:03 2020 -0500

Merge branch 'bug33212_035' into maint-0.3.5

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1

2020-02-10 Thread nickm

commit 71c49f735636d626abaa13222aa14e7c97f73393
Merge: 7afb95d3e f3fa22bf1
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:10 2020 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.2] Merge branch 'maint-0.3.5' into maint-0.4.0

2020-02-10 Thread nickm

commit f3fa22bf1b52dfce65a37e6a84bac8635916e8c2
Merge: 65825018c 2b6df3da2
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:09 2020 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.2] Merge branch 'bug33212_035' into maint-0.3.5

2020-02-10 Thread nickm

commit 2b6df3da21803519c262099ab9dd950271f3ce11
Merge: 41d52e9cd 99d044d55
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:03 2020 -0500

Merge branch 'bug33212_035' into maint-0.3.5

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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] Fix a Rust compilation warning; resolve bug 33212.

2020-02-10 Thread nickm

commit 99d044d553c08d3b2900dbca30199083067515b2
Author: Nick Mathewson 
Date:   Mon Feb 10 13:32:09 2020 -0500

Fix a Rust compilation warning; resolve bug 33212.
---
 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/ticket33212 b/changes/ticket33212
new file mode 100644
index 0..aeb09e0c6
--- /dev/null
+++ b/changes/ticket33212
@@ -0,0 +1,4 @@
+  o Minor bugfixes (rust, build):
+- Fix a syntax warning given by newer versions of Rust, and creating
+  problems for our continuous integration.
+  Fixes bug 33212; bugfix on 0.3.5.1-alpha.
diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs
index 2661d811c..06fdf56c6 100644
--- a/src/rust/protover/protover.rs
+++ b/src/rust/protover/protover.rs
@@ -26,7 +26,7 @@ const FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS: &'static str 
= "0.2.9.3-alpha";
 /// before concluding that someone is trying to DoS us
 ///
 /// C_RUST_COUPLED: protover.c `MAX_PROTOCOLS_TO_EXPAND`
-const MAX_PROTOCOLS_TO_EXPAND: usize = (1 << 16);
+const MAX_PROTOCOLS_TO_EXPAND: usize = 1 << 16;
 
 /// The maximum size an `UnknownProtocol`'s name may be.
 pub(crate) const MAX_PROTOCOL_NAME_LENGTH: usize = 100;



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

[tor-commits] [tor/maint-0.4.0] Fix a Rust compilation warning; resolve bug 33212.

2020-02-10 Thread nickm

commit 99d044d553c08d3b2900dbca30199083067515b2
Author: Nick Mathewson 
Date:   Mon Feb 10 13:32:09 2020 -0500

Fix a Rust compilation warning; resolve bug 33212.
---
 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/ticket33212 b/changes/ticket33212
new file mode 100644
index 0..aeb09e0c6
--- /dev/null
+++ b/changes/ticket33212
@@ -0,0 +1,4 @@
+  o Minor bugfixes (rust, build):
+- Fix a syntax warning given by newer versions of Rust, and creating
+  problems for our continuous integration.
+  Fixes bug 33212; bugfix on 0.3.5.1-alpha.
diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs
index 2661d811c..06fdf56c6 100644
--- a/src/rust/protover/protover.rs
+++ b/src/rust/protover/protover.rs
@@ -26,7 +26,7 @@ const FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS: &'static str 
= "0.2.9.3-alpha";
 /// before concluding that someone is trying to DoS us
 ///
 /// C_RUST_COUPLED: protover.c `MAX_PROTOCOLS_TO_EXPAND`
-const MAX_PROTOCOLS_TO_EXPAND: usize = (1 << 16);
+const MAX_PROTOCOLS_TO_EXPAND: usize = 1 << 16;
 
 /// The maximum size an `UnknownProtocol`'s name may be.
 pub(crate) const MAX_PROTOCOL_NAME_LENGTH: usize = 100;



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

[tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1

2020-02-10 Thread nickm

commit 71c49f735636d626abaa13222aa14e7c97f73393
Merge: 7afb95d3e f3fa22bf1
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:10 2020 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.2] Merge branch 'maint-0.4.0' into maint-0.4.1

2020-02-10 Thread nickm

commit 71c49f735636d626abaa13222aa14e7c97f73393
Merge: 7afb95d3e f3fa22bf1
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:10 2020 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0

2020-02-10 Thread nickm

commit f3fa22bf1b52dfce65a37e6a84bac8635916e8c2
Merge: 65825018c 2b6df3da2
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:09 2020 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.5] Merge branch 'bug33212_035' into maint-0.3.5

2020-02-10 Thread nickm

commit 2b6df3da21803519c262099ab9dd950271f3ce11
Merge: 41d52e9cd 99d044d55
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:03 2020 -0500

Merge branch 'bug33212_035' into maint-0.3.5

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.2] Fix a Rust compilation warning; resolve bug 33212.

2020-02-10 Thread nickm

commit 99d044d553c08d3b2900dbca30199083067515b2
Author: Nick Mathewson 
Date:   Mon Feb 10 13:32:09 2020 -0500

Fix a Rust compilation warning; resolve bug 33212.
---
 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/ticket33212 b/changes/ticket33212
new file mode 100644
index 0..aeb09e0c6
--- /dev/null
+++ b/changes/ticket33212
@@ -0,0 +1,4 @@
+  o Minor bugfixes (rust, build):
+- Fix a syntax warning given by newer versions of Rust, and creating
+  problems for our continuous integration.
+  Fixes bug 33212; bugfix on 0.3.5.1-alpha.
diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs
index 2661d811c..06fdf56c6 100644
--- a/src/rust/protover/protover.rs
+++ b/src/rust/protover/protover.rs
@@ -26,7 +26,7 @@ const FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS: &'static str 
= "0.2.9.3-alpha";
 /// before concluding that someone is trying to DoS us
 ///
 /// C_RUST_COUPLED: protover.c `MAX_PROTOCOLS_TO_EXPAND`
-const MAX_PROTOCOLS_TO_EXPAND: usize = (1 << 16);
+const MAX_PROTOCOLS_TO_EXPAND: usize = 1 << 16;
 
 /// The maximum size an `UnknownProtocol`'s name may be.
 pub(crate) const MAX_PROTOCOL_NAME_LENGTH: usize = 100;



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

[tor-commits] [tor/maint-0.4.1] Merge branch 'bug33212_035' into maint-0.3.5

2020-02-10 Thread nickm

commit 2b6df3da21803519c262099ab9dd950271f3ce11
Merge: 41d52e9cd 99d044d55
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:03 2020 -0500

Merge branch 'bug33212_035' into maint-0.3.5

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.0] Merge branch 'bug33212_035' into maint-0.3.5

2020-02-10 Thread nickm

commit 2b6df3da21803519c262099ab9dd950271f3ce11
Merge: 41d52e9cd 99d044d55
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:03 2020 -0500

Merge branch 'bug33212_035' into maint-0.3.5

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0

2020-02-10 Thread nickm

commit f3fa22bf1b52dfce65a37e6a84bac8635916e8c2
Merge: 65825018c 2b6df3da2
Author: Nick Mathewson 
Date:   Mon Feb 10 14:17:09 2020 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 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.4.1] Fix a Rust compilation warning; resolve bug 33212.

2020-02-10 Thread nickm

commit 99d044d553c08d3b2900dbca30199083067515b2
Author: Nick Mathewson 
Date:   Mon Feb 10 13:32:09 2020 -0500

Fix a Rust compilation warning; resolve bug 33212.
---
 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/ticket33212 b/changes/ticket33212
new file mode 100644
index 0..aeb09e0c6
--- /dev/null
+++ b/changes/ticket33212
@@ -0,0 +1,4 @@
+  o Minor bugfixes (rust, build):
+- Fix a syntax warning given by newer versions of Rust, and creating
+  problems for our continuous integration.
+  Fixes bug 33212; bugfix on 0.3.5.1-alpha.
diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs
index 2661d811c..06fdf56c6 100644
--- a/src/rust/protover/protover.rs
+++ b/src/rust/protover/protover.rs
@@ -26,7 +26,7 @@ const FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS: &'static str 
= "0.2.9.3-alpha";
 /// before concluding that someone is trying to DoS us
 ///
 /// C_RUST_COUPLED: protover.c `MAX_PROTOCOLS_TO_EXPAND`
-const MAX_PROTOCOLS_TO_EXPAND: usize = (1 << 16);
+const MAX_PROTOCOLS_TO_EXPAND: usize = 1 << 16;
 
 /// The maximum size an `UnknownProtocol`'s name may be.
 pub(crate) const MAX_PROTOCOL_NAME_LENGTH: usize = 100;



___
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.5] Fix a Rust compilation warning; resolve bug 33212.

2020-02-10 Thread nickm

commit 99d044d553c08d3b2900dbca30199083067515b2
Author: Nick Mathewson 
Date:   Mon Feb 10 13:32:09 2020 -0500

Fix a Rust compilation warning; resolve bug 33212.
---
 changes/ticket33212   | 4 
 src/rust/protover/protover.rs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/ticket33212 b/changes/ticket33212
new file mode 100644
index 0..aeb09e0c6
--- /dev/null
+++ b/changes/ticket33212
@@ -0,0 +1,4 @@
+  o Minor bugfixes (rust, build):
+- Fix a syntax warning given by newer versions of Rust, and creating
+  problems for our continuous integration.
+  Fixes bug 33212; bugfix on 0.3.5.1-alpha.
diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs
index 2661d811c..06fdf56c6 100644
--- a/src/rust/protover/protover.rs
+++ b/src/rust/protover/protover.rs
@@ -26,7 +26,7 @@ const FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS: &'static str 
= "0.2.9.3-alpha";
 /// before concluding that someone is trying to DoS us
 ///
 /// C_RUST_COUPLED: protover.c `MAX_PROTOCOLS_TO_EXPAND`
-const MAX_PROTOCOLS_TO_EXPAND: usize = (1 << 16);
+const MAX_PROTOCOLS_TO_EXPAND: usize = 1 << 16;
 
 /// The maximum size an `UnknownProtocol`'s name may be.
 pub(crate) const MAX_PROTOCOL_NAME_LENGTH: usize = 100;



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

[tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb

2020-02-10 Thread translation

commit 3c437d6fd116923237e5c7feb84b040fa7e73fdc
Author: Translation commit bot 
Date:   Mon Feb 10 18:45:16 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
---
 is/LC_MESSAGES/bridgedb.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/is/LC_MESSAGES/bridgedb.po b/is/LC_MESSAGES/bridgedb.po
index 282828dfa2..c9ea69db60 100644
--- a/is/LC_MESSAGES/bridgedb.po
+++ b/is/LC_MESSAGES/bridgedb.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Sveinn Ã Felli , 2016-2017,2019
+# Sveinn Ã Felli , 2016-2017,2019-2020
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2020-02-10 18:43+\n"
+"Last-Translator: Sveinn Ã Felli \n"
 "Language-Team: Icelandic 
(http://www.transifex.com/otf/torproject/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -291,7 +291,7 @@ msgid ""
 "empty and write \"get transport obfs4\" in the email's message body. Please 
note\n"
 "that you must send the email using an address from one of the following 
email\n"
 "providers: %s or %s."
-msgstr ""
+msgstr "Ãnnur leiÃ° til aÃ° nÃ¡ Ã brÃ½r er aÃ° senda tÃ¶lvupÃ³st til %s. 
Skildu viÃ°fangsefni pÃ³stsins\neftir autt og skrifaÃ°u \"get transport obfs4\" 
Ã meginmÃ¡l skilaboÃ°anna.\nAthugaÃ°u aÃ° Ã¾Ãº verÃ°ur\naÃ° senda 
tÃ¶lvupÃ³stinn meÃ° netfangi frÃ¡ einhverjum aÃ° eftirtÃ¶ldum 
pÃ³stÃ¾jÃ³nustum:\n%s eÃ°a %s."
 
 #: bridgedb/strings.py:117
 msgid "My bridges don't work! I need help!"

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

[tor-commits] [translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed

2020-02-10 Thread translation

commit 89bca0417743a31a9bb00b1ef58945f6b474bcba
Author: Translation commit bot 
Date:   Mon Feb 10 18:45:22 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
---
 is/LC_MESSAGES/bridgedb.po | 56 --
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/is/LC_MESSAGES/bridgedb.po b/is/LC_MESSAGES/bridgedb.po
index 1374feaeab..613cfe4ea9 100644
--- a/is/LC_MESSAGES/bridgedb.po
+++ b/is/LC_MESSAGES/bridgedb.po
@@ -1,15 +1,15 @@
 # Translations template for bridgedb.
-# Copyright (C) 2019 'The Tor Project, Inc.'
+# Copyright (C) 2020 'The Tor Project, Inc.'
 # This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Sveinn Ã Felli , 2016-2017,2019
+# Sveinn Ã Felli , 2016-2017,2019-2020
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
-"POT-Creation-Date: 2019-10-19 14:51-0700\n"
-"PO-Revision-Date: 2019-11-07 20:27+\n"
+"POT-Creation-Date: 2020-02-04 10:59-0800\n"
+"PO-Revision-Date: 2020-02-10 18:43+\n"
 "Last-Translator: Sveinn Ã Felli \n"
 "Language-Team: Icelandic 
(http://www.transifex.com/otf/torproject/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -283,62 +283,64 @@ msgstr ""
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:109
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you 
must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"Another way to get bridges is to send an email to %s. Leave the email 
subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please 
note\n"
+"that you must send the email using an address from one of the following 
email\n"
+"providers: %s or %s."
 msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:117
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
 #. "Support Portal", respectively.
-#: bridgedb/strings.py:119
+#: bridgedb/strings.py:121
 #, python-format
 msgid ""
 "If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:123
+#: bridgedb/strings.py:125
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: bridgedb/strings.py:124
+#: bridgedb/strings.py:126
 msgid "Get Bridges!"
 msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:131
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: bridgedb/strings.py:130
+#: bridgedb/strings.py:132
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:136
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:137
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 msgid "How to start using your bridges"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:143
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -347,21 +349,21 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:148
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and 
follow\n"
 "the wizard until it asks:"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:150
+#: bridgedb/strings.py:152
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor 
connections\n"
 "to the Tor network?"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:154
+#: bridgedb/strings.py:156
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', 
and\n"
@@ -369,28 +371,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: bridgedb/strings.py:162
+#: bridgedb/strings.py:164
 msgid "Displays this message."
 msgstr ""
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:166
+#: bridgedb/strings.py:168
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: bridgedb/strings.py:167
+#:

[tor-commits] [tor/master] bump to 0.4.3.2-alpha

2020-02-10 Thread nickm

commit dab0b1c3a775ad2f0bd5df785cf6b0c56eb18361
Author: Nick Mathewson 
Date:   Mon Feb 10 13:37:59 2020 -0500

bump to 0.4.3.2-alpha
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index ec5ac4408..e31b5751f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.3.1-alpha-dev])
+AC_INIT([tor],[0.4.3.2-alpha])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -16,7 +16,7 @@ configure_flags="$*"
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2020-01-23"], # for 0.4.3.1-alpha-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2020-02-10"], # for 0.4.3.2-alpha
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 3a4bd2c4b..6e5775a5e 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.3.1-alpha-dev"
+!define VERSION "0.4.3.2-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index adcd9df3e..5422c9748 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.3.1-alpha-dev"
+#define VERSION "0.4.3.2-alpha"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR

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

[tor-commits] [tpo/master] Update job post

2020-02-10 Thread hiro

commit 5cba8e965e16d49179b9d45d5dc0d8c97707b010
Author: hiro 
Date:   Mon Feb 10 19:20:21 2020 +0100

Update job post
---
 content/about/jobs/executive-assistant/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/about/jobs/executive-assistant/contents.lr 
b/content/about/jobs/executive-assistant/contents.lr
index 219ce62..66b3522 100644
--- a/content/about/jobs/executive-assistant/contents.lr
+++ b/content/about/jobs/executive-assistant/contents.lr
@@ -88,7 +88,7 @@ Required Skills & Qualifications:
 
 To apply:
 
-Please email a *PDF* of your resume/CV, and a cover letter explaining how your 
qualifications and experience meet the requirements of this job description. 
Please include the reasons why you want to work at Tor Project.
+Please email a *PDF* of your resume/CV, and a cover letter explaining how your 
qualifications and experience meet the requirements of this job description. 
Please include your salary requirements and why you want to work at Tor Project.
 
 Email should be sent to hr at torproject dot org with "Executive Assistant " 
in the subject line. No phone calls, please.
 

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

[tor-commits] [tpo/master] Add new job post

2020-02-10 Thread hiro

commit 4d90ac726921d434a4a496d22d252c3d923ad61f
Author: hiro 
Date:   Mon Feb 10 18:21:07 2020 +0100

Add new job post
---
 content/about/jobs/executive-assistant/contents.lr | 110 -
 1 file changed, 66 insertions(+), 44 deletions(-)

diff --git a/content/about/jobs/executive-assistant/contents.lr 
b/content/about/jobs/executive-assistant/contents.lr
index 21772ed..219ce62 100644
--- a/content/about/jobs/executive-assistant/contents.lr
+++ b/content/about/jobs/executive-assistant/contents.lr
@@ -6,78 +6,100 @@ section: about
 ---
 section_id: about
 ---
-active: False
+active: True
 ---
-title: Backend Engineer for OONI
+title: Executive Assistant
 ---
 color: primary
 ---
 summary:
-The Tor Project, Inc. is looking for a dedicated backend engineer to work on 
OONI (https://ooni.torproject.org/). OONI is the Open Observatory of Network 
Interference: a free and open source software, global observation network for 
detecting censorship, surveillance, and traffic manipulation on the internet.
+The Tor Project is looking for an Executive Assistant!
 
-You will be working to improve OONI's data processing pipeline and other 
backend components responsible for recording measurements collected from our 
growing global user network. You will also be tasked with improving our network 
measurement methodologies and data analysis heuristics to increase the accuracy 
of our experiments.
+The Executive Assistant is responsible for providing high-level administrative 
support to the Executive Director. This position will actively manage the 
EDâs schedule, handle internal and external executive-level communications, 
and coordinate special projects and events.
+
+This position is full-time and remote; someone in the Eastern time zone 
strongly preferred.
 
 ---
 description:
 
-## Backend Engineer for OONI
-*January 31, 2018*
+## Executive Assistant
+
+*February 5, 2020*
+
+The Tor Project is looking for an Executive Assistant!
+
+The Executive Assistant is responsible for providing high-level administrative 
support to the Executive Director. This position will actively manage the 
EDâs schedule, handle internal and external executive-level communications, 
and coordinate special projects and events.
+
+This position is full-time and remote; someone in the Eastern time zone 
strongly preferred.
+
+You:
+
+- Technology-competent and/or willing and able to learn new tools. Our team 
coordinates via IRC (the grandparent of Slack), email, Signal messaging app, 
and bug trackers, etc.
+
+- Have an exceptional ability to see ten steps ahead, anticipating and heading 
off issues before they become problems.
+
+- Highly skilled at prioritizing EDâs tasks and effectively communicating 
changing priorities on a daily basis.
+
+- Problem solver! Plans, strategies, and schedules change: You react quickly, 
are resilient, and take the initiative to find the best alternatives when these 
changes arise.
+
+- Independent: self-directed and able to get the job done; ensure the ED is on 
track.
+
+- Proactive: you take initiative in improving processes; youâre always 
thinking ahead.
+
+Job Duties:
+
+- Manage EDâs schedule: schedule meetings, screen for conflicts, and ensure 
the ED is prepared for important meetings.
+
+- Arrange travel, prepare expense reports, and handle other administrative 
tasks.
+
+- Head up the planning and logistics of twice-yearly organization-wide 
meetings.
+
+- Serve as proxy for ED at certain weekly meetings, take notes, and keep track 
of EDâs action items.
+
+- Develop and sustain a high level of professionalism among staff and 
community members.
+
+- Assist the ED with administering the organizationâs travel policy: follow 
up on travel approvals and expenses and help manage the budget.
+
+- Assist the ED with reports, presentations, and follow ups with/for major 
donors and sponsors.
 
-The Tor Project, Inc. is looking for a dedicated backend engineer to work on 
OONI (https://ooni.torproject.org/). OONI is the Open Observatory of Network 
Interference: a free and open source software, global observation network for 
detecting censorship, surveillance, and traffic manipulation on the internet.
+Required Skills & Qualifications:
 
-You will be working to improve OONI's data processing pipeline and other 
backend components responsible for recording measurements collected from our 
growing global user network. You will also be tasked with improving our network 
measurement methodologies and data analysis heuristics to increase the accuracy 
of our experiments.
+- Be personable with strong interpersonal and oral/written communication 
skills; ability or willingness to learn to use various communication tools and 
function in an asynchronous work environment.
 
-This is a full-time 12-month contract position, starting ASAP (no later than 
mid-May 2019); contract may be extended.
+- Uphold a strict level of confidentiality.
 
-The OONI team is based in Europe.

[tor-commits] [tor/master] Added Timeout and Node Sections to the Tor Manual

2020-02-10 Thread nickm

commit 304aa4048c6673f3a2f10a1df8285dae7304e496
Author: swati 
Date:   Sat Feb 1 00:07:56 2020 +0530

Added Timeout and Node Sections to the Tor Manual
---
 doc/tor.1.txt | 540 +-
 1 file changed, 273 insertions(+), 267 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index a5108df80..dde9ffd54 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -998,18 +998,6 @@ The following options are useful only for clients (that 
is, if
 the documentation of the pluggable transport for details of what
 arguments it supports.
 
-// Out of order because it logically belongs before the CircuitBuildTimeout 
option
-[[LearnCircuitBuildTimeout]] **LearnCircuitBuildTimeout** **0**|**1**::
-If 0, CircuitBuildTimeout adaptive learning is disabled. (Default: 1)
-
-[[CircuitBuildTimeout]] **CircuitBuildTimeout** __NUM__::
-
-Try for at most NUM seconds when building circuits. If the circuit isn't
-open in that time, give up on it. If LearnCircuitBuildTimeout is 1, this
-value serves as the initial value to use before a timeout is learned. If
-LearnCircuitBuildTimeout is 0, this value is the only value used.
-(Default: 60 seconds)
-
 [[CircuitPadding]] **CircuitPadding** **0**|**1**::
 If set to 0, Tor will not pad client circuits with additional cover
 traffic. Only clients may set this option. This option should be offered
@@ -1025,22 +1013,6 @@ The following options are useful only for clients (that 
is, if
 via the UI to mobile users for use where bandwidth may be expensive.
 (Default: 0)
 
-[[CircuitsAvailableTimeout]] **CircuitsAvailableTimeout** __NUM__::
-Tor will attempt to keep at least one open, unused circuit available for
-this amount of time. This option governs how long idle circuits are kept
-open, as well as the amount of time Tor will keep a circuit open to each
-of the recently used ports. This way when the Tor client is entirely
-idle, it can expire all of its circuits, and then expire its TLS
-connections. Note that the actual timeout value is uniformly randomized
-from the specified value to twice that amount. (Default: 30 minutes;
-Max: 24 hours)
-
-[[CircuitStreamTimeout]] **CircuitStreamTimeout** __NUM__::
-If non-zero, this option overrides our internal timeout schedule for how
-many seconds until we detach a stream from a circuit and try a new circuit.
-If your network is particularly slow, you might want to set this to a
-number like 60. (Default: 0)
-
 [[ClientAutoIPv6ORPort]] **ClientAutoIPv6ORPort** **0**|**1**::
 If this option is set to 1, Tor clients randomly prefer a node's IPv4 or
 IPv6 ORPort. The random preference is set every time a node is loaded
@@ -1181,13 +1153,6 @@ The following options are useful only for clients (that 
is, if
 is launched for some other reason (for example, by a startup
 process, or by an application that launches itself on every login.)
 
-[[DormantClientTimeout]] **DormantClientTimeout**  __N__ 
**minutes**|**hours**|**days**|**weeks**::
-If Tor spends this much time without any client activity,
-enter a dormant state where automatic circuits are not built, and
-directory information is not fetched.
-Does not affect servers or onion services. Must be at least 10 minutes.
-(Default: 24 hours)
-
 [[DormantOnFirstStartup]] **DormantOnFirstStartup** **0**|**1**::
 If true, then the first time Tor starts up with a fresh DataDirectory,
 it starts in dormant mode, and takes no actions until the user has made
@@ -1198,11 +1163,6 @@ The following options are useful only for clients (that 
is, if
 After the first time Tor starts, it begins in dormant mode if it was
 dormant before, and not otherwise. (Default: 0)
 
-[[DormantTimeoutDisabledByIdleStreams]] 
**DormantTimeoutDisabledByIdleStreams**  **0**|**1**::
-If true, then any open client stream (even one not reading or writing)
-counts as client activity for the purpose of DormantClientTimeout.
-If false, then only network activity counts. (Default: 1)
-
 [[DownloadExtraInfo]] **DownloadExtraInfo** **0**|**1**::
 If true, Tor downloads and caches "extra-info" documents. These documents
 contain information about servers other than the information in their
@@ -1214,76 +1174,6 @@ The following options are useful only for clients (that 
is, if
 the same circuit. Currently, two addresses are "too close" if they lie in
 the same /16 range. (Default: 1)
 
-[[EntryNodes]] **EntryNodes** __node__,__node__,__...__::
-A list of identity fingerprints and country codes of nodes
-to use for the first hop in your normal circuits.
-Normal circuits include all
-circuits except for direct connections to directory servers.  The Bridge
-option overrides this option; if you have configured bridges and
-UseBridges is 1, the Bridges are used as your entry nodes. +
- +
-The

[tor-commits] [tor/master] changes file for tickets 32928, 32929

2020-02-10 Thread nickm

commit cb757b30a208f027ca36d7acceade61faf348009
Author: Taylor Yu 
Date:   Fri Feb 7 12:54:55 2020 -0600

changes file for tickets 32928, 32929
---
 changes/ticket32928 | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/changes/ticket32928 b/changes/ticket32928
new file mode 100644
index 0..f7739e928
--- /dev/null
+++ b/changes/ticket32928
@@ -0,0 +1,7 @@
+  o Documentation (manpage):
+- Split Circuit Timeout options into their own section of the tor
+  manpage.  Closes ticket 32928.  Work by Swati Thacker as part of
+  Google Season of Docs.
+- Split Node selection options into their own section of the tor
+  manpage.  Closes ticket 32929.  Work by Swati Thacker as part of
+  Google Season of Docs.



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

[tor-commits] [tor/master] Updated introductory text for CIRCUIT TIMEOUT and DORMANT MODE options

2020-02-10 Thread nickm

commit 305934c67b919b7ab16270e4c75531f5e0de7210
Author: swati 
Date:   Fri Feb 7 16:36:09 2020 +0530

Updated introductory text for CIRCUIT TIMEOUT and DORMANT MODE options
---
 doc/tor.1.txt | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 73f9dd385..a9b9852b7 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1737,7 +1737,8 @@ The following options are useful only for clients (that 
is, if
 // These options are in alphabetical order, with exceptions as noted.
 // Please keep them that way!
 
-The following options are useful for configuring timeouts:
+The following options are useful for configuring timeouts related
+to building Tor circuits and using them:
 
 [[CircuitsAvailableTimeout]] **CircuitsAvailableTimeout** __NUM__::
 Tor will attempt to keep at least one open, unused circuit available for
@@ -1776,8 +1777,8 @@ The following options are useful for configuring timeouts:
 // These options are in alphabetical order, with exceptions as noted.
 // Please keep them that way!
 
-The following options can be used to configure Tor
-when the client is running in dormant mode:
+Tor can enter dormant mode to conserve power and network bandwidth.
+The following options control when Tor enters and leaves dormant mode:
 
 [[DormantCanceledByStartup]] **DormantCanceledByStartup** **0**|**1**::
 By default, Tor starts in active mode if it was active the last time



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

[tor-commits] [tor/master] Updated the introductory text and titles of Timeout and Node selection options

2020-02-10 Thread nickm

commit d75d763155335f29ae75530d524af8f2e81e425e
Author: swati 
Date:   Wed Feb 5 00:28:27 2020 +0530

Updated the introductory text and titles of Timeout and Node selection 
options
---
 doc/tor.1.txt | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index dde9ffd54..77423f804 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1769,6 +1769,9 @@ The following options are useful only for clients (that 
is, if
 
 == TIMEOUT OPTIONS
 
+// These options are in alphabetical order, with exceptions as noted.
+// Please keep them that way!
+
 The following options are useful for configuring timeouts:
 
 [[CircuitsAvailableTimeout]] **CircuitsAvailableTimeout** __NUM__::
@@ -1815,9 +1818,15 @@ The following options are useful for configuring 
timeouts:
 unattached waiting for an appropriate circuit, before we fail it. (Default:
 2 minutes)
 
-== ADVANCED OPTIONS
+== NODE SELECTION OPTIONS
+
+// These options are in alphabetical order, with exceptions as noted.
+// Please keep them that way!
+
+The following options restrict the nodes that a tor client
+(or onion service) can use while building a circuit:
 
-The following options include Tor nodes:
+These options can weaken your anonymity by making your client behavior 
different from other Tor clients:
 
 [[EntryNodes]] **EntryNodes** __node__,__node__,__...__::
 A list of identity fingerprints and country codes of nodes



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

[tor-commits] [tor/master] Added the NodeFamily option to Node Selection Options section

2020-02-10 Thread nickm

commit 1b65024ae21ba5ad19107121be76327d6ffbc9c3
Author: swati 
Date:   Wed Feb 5 23:13:41 2020 +0530

Added the NodeFamily option to Node Selection Options section
---
 doc/tor.1.txt | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 77423f804..43a014c60 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1298,16 +1298,6 @@ The following options are useful only for clients (that 
is, if
 Every NUM seconds consider whether to build a new circuit. (Default: 30
 seconds)
 
-[[NodeFamily]] **NodeFamily** __node__,__node__,__...__::
-The Tor servers, defined by their identity fingerprints,
-constitute a "family" of similar or co-administered servers, so never use
-any two of them in the same circuit. Defining a NodeFamily is only needed
-when a server doesn't list the family itself (with MyFamily). This option
-can be used multiple times; each instance defines a separate family.  In
-addition to nodes, you can also list IP address and ranges and country
-codes in {curly braces}. See the **ExcludeNodes** option for more
-information on how to specify nodes.
-
 [[OptimisticData]] **OptimisticData** **0**|**1**|**auto**::
 When this option is set, and Tor is using an exit node that supports
 the feature, it will try optimistically to send data to the exit node
@@ -1824,9 +1814,9 @@ The following options are useful for configuring timeouts:
 // Please keep them that way!
 
 The following options restrict the nodes that a tor client
-(or onion service) can use while building a circuit:
-
-These options can weaken your anonymity by making your client behavior 
different from other Tor clients:
+(or onion service) can use while building a circuit.
+These options can weaken your anonymity by making your client behavior
+different from other Tor clients:
 
 [[EntryNodes]] **EntryNodes** __node__,__node__,__...__::
 A list of identity fingerprints and country codes of nodes
@@ -2036,6 +2026,16 @@ These options can weaken your anonymity by making your 
client behavior different
 MiddleNodes and ExcludeNodes is treated as excluded. See
 the **ExcludeNodes** option for more information on how to specify nodes.
 
+[[NodeFamily]] **NodeFamily** __node__,__node__,__...__::
+The Tor servers, defined by their identity fingerprints,
+constitute a "family" of similar or co-administered servers, so never use
+any two of them in the same circuit. Defining a NodeFamily is only needed
+when a server doesn't list the family itself (with MyFamily). This option
+can be used multiple times; each instance defines a separate family.  In
+addition to nodes, you can also list IP address and ranges and country
+codes in {curly braces}. See the **ExcludeNodes** option for more
+information on how to specify nodes.
+
 [[StrictNodes]] **StrictNodes** **0**|**1**::
 If StrictNodes is set to 1, Tor will treat solely the ExcludeNodes option
 as a requirement to follow for all the circuits you generate, even if



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

[tor-commits] [tor/master] Added a section for Dormant mode options

2020-02-10 Thread nickm

commit 05adecf2115fe8e95a888a6ad5cdc0322181a332
Author: swati 
Date:   Thu Feb 6 21:33:58 2020 +0530

Added a section for Dormant mode options
---
 doc/tor.1.txt | 70 +--
 1 file changed, 39 insertions(+), 31 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 43a014c60..73f9dd385 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1138,31 +1138,6 @@ The following options are useful only for clients (that 
is, if
 addresses/ports. See SocksPort for an explanation of isolation
 flags. (Default: 0)
 
-[[DormantCanceledByStartup]] **DormantCanceledByStartup** **0**|**1**::
-By default, Tor starts in active mode if it was active the last time
-it was shut down, and in dormant mode if it was dormant.  But if
-this option is true, Tor treats every startup event as user
-activity, and Tor will never start in Dormant mode, even if it has
-been unused for a long time on previous runs. (Default: 0)
- +
-Note: Packagers and application developers should change the value of
-this option only with great caution: it has the potential to
-create spurious traffic on the network.  This option should only
-be used if Tor is started by an affirmative user activity (like
-clicking on an applcation or running a command), and not if Tor
-is launched for some other reason (for example, by a startup
-process, or by an application that launches itself on every login.)
-
-[[DormantOnFirstStartup]] **DormantOnFirstStartup** **0**|**1**::
-If true, then the first time Tor starts up with a fresh DataDirectory,
-it starts in dormant mode, and takes no actions until the user has made
-a request.  (This mode is recommended if installing a Tor client for a
-user who might not actually use it.)  If false, Tor bootstraps the first
-time it is started, whether it sees a user request or not.
- +
-After the first time Tor starts, it begins in dormant mode if it was
-dormant before, and not otherwise. (Default: 0)
-
 [[DownloadExtraInfo]] **DownloadExtraInfo** **0**|**1**::
 If true, Tor downloads and caches "extra-info" documents. These documents
 contain information about servers other than the information in their
@@ -1757,7 +1732,7 @@ The following options are useful only for clients (that 
is, if
 used IP. For local use, no change to the default VirtualAddrNetwork setting
 is needed.
 
-== TIMEOUT OPTIONS
+== CIRCUIT TIMEOUT OPTIONS
 
 // These options are in alphabetical order, with exceptions as noted.
 // Please keep them that way!
@@ -1791,6 +1766,34 @@ The following options are useful for configuring 
timeouts:
 If your network is particularly slow, you might want to set this to a
 number like 60. (Default: 0)
 
+[[SocksTimeout]] **SocksTimeout** __NUM__::
+Let a socks connection wait NUM seconds handshaking, and NUM seconds
+unattached waiting for an appropriate circuit, before we fail it. (Default:
+2 minutes)
+
+== DORMANT MODE OPTIONS
+
+// These options are in alphabetical order, with exceptions as noted.
+// Please keep them that way!
+
+The following options can be used to configure Tor
+when the client is running in dormant mode:
+
+[[DormantCanceledByStartup]] **DormantCanceledByStartup** **0**|**1**::
+By default, Tor starts in active mode if it was active the last time
+it was shut down, and in dormant mode if it was dormant.  But if
+this option is true, Tor treats every startup event as user
+activity, and Tor will never start in Dormant mode, even if it has
+been unused for a long time on previous runs. (Default: 0)
+ +
+Note: Packagers and application developers should change the value of
+this option only with great caution: it has the potential to
+create spurious traffic on the network.  This option should only
+be used if Tor is started by an affirmative user activity (like
+clicking on an applcation or running a command), and not if Tor
+is launched for some other reason (for example, by a startup
+process, or by an application that launches itself on every login.)
+
 [[DormantClientTimeout]] **DormantClientTimeout**  __N__ 
**minutes**|**hours**|**days**|**weeks**::
 If Tor spends this much time without any client activity,
 enter a dormant state where automatic circuits are not built, and
@@ -1798,16 +1801,21 @@ The following options are useful for configuring 
timeouts:
 Does not affect servers or onion services. Must be at least 10 minutes.
 (Default: 24 hours)
 
+[[DormantOnFirstStartup]] **DormantOnFirstStartup** **0**|**1**::
+If true, then the first time Tor starts up with a fresh DataDirectory,
+it starts in dormant mode, and takes no actions until the user has made
+a request.  (This mode is recommended if installing a Tor client for a
+user who might not actually use it.)  If false, Tor bootstraps the first
+time it is

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1711'

2020-02-10 Thread nickm

commit 05a05773f284dd870282e05ae918d74300ddbc19
Merge: 5e6021bda cb757b30a
Author: Nick Mathewson 
Date:   Mon Feb 10 10:23:50 2020 -0500

Merge remote-tracking branch 'tor-github/pr/1711'

 changes/ticket32928 |   7 +
 doc/tor.1.txt   | 628 +++-
 2 files changed, 333 insertions(+), 302 deletions(-)

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

[tor-commits] [tpo/master] Update lego

2020-02-10 Thread hiro

commit 86bc2f555cec76be39573cf47a320d5e4fc12048
Author: hiro 
Date:   Mon Feb 10 15:46:30 2020 +0100

Update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index e058aee..e9dd081 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit e058aee7e40a97434ddbffbb1d5ffe18a610076b
+Subproject commit e9dd081027132aa21f6abd74be708323ff3b9180

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

[tor-commits] [tpo/master] Add new job post

2020-02-10 Thread hiro

commit f72483b4bd122a16e0c20b1619ab3ece50442cd1
Author: hiro 
Date:   Mon Feb 10 15:45:43 2020 +0100

Add new job post
---
 content/about/jobs/executive-assistant/contents.lr | 83 ++
 1 file changed, 83 insertions(+)

diff --git a/content/about/jobs/executive-assistant/contents.lr 
b/content/about/jobs/executive-assistant/contents.lr
new file mode 100644
index 000..21772ed
--- /dev/null
+++ b/content/about/jobs/executive-assistant/contents.lr
@@ -0,0 +1,83 @@
+_model: job
+---
+_template: about.html
+---
+section: about
+---
+section_id: about
+---
+active: False
+---
+title: Backend Engineer for OONI
+---
+color: primary
+---
+summary:
+The Tor Project, Inc. is looking for a dedicated backend engineer to work on 
OONI (https://ooni.torproject.org/). OONI is the Open Observatory of Network 
Interference: a free and open source software, global observation network for 
detecting censorship, surveillance, and traffic manipulation on the internet.
+
+You will be working to improve OONI's data processing pipeline and other 
backend components responsible for recording measurements collected from our 
growing global user network. You will also be tasked with improving our network 
measurement methodologies and data analysis heuristics to increase the accuracy 
of our experiments.
+
+---
+description:
+
+## Backend Engineer for OONI
+*January 31, 2018*
+
+The Tor Project, Inc. is looking for a dedicated backend engineer to work on 
OONI (https://ooni.torproject.org/). OONI is the Open Observatory of Network 
Interference: a free and open source software, global observation network for 
detecting censorship, surveillance, and traffic manipulation on the internet.
+
+You will be working to improve OONI's data processing pipeline and other 
backend components responsible for recording measurements collected from our 
growing global user network. You will also be tasked with improving our network 
measurement methodologies and data analysis heuristics to increase the accuracy 
of our experiments.
+
+This is a full-time 12-month contract position, starting ASAP (no later than 
mid-May 2019); contract may be extended.
+
+The OONI team is based in Europe. However, this position may be performed 
remotely.
+
+Here are some of our code repositories:
+
+   https://github.com/ooni/api
+   https://github.com/ooni/pipeline
+   https://github.com/ooni/orchestra
+   https://github.com/ooni/collector
+   https://github.com/ooni/sysadmin
+
+**Required skills and qualifications:**
+
+ - Extensive experience in python or golang.
+ - Comfortable working remotely.
+ - Self-directed, self-disciplined, but good at working and communicating with 
a team.
+ - Have experience and be comfortable with others reviewing your code and 
design; have experience and be comfortable reviewing others' code.
+ - Experience documenting and designing protocols.
+ - Be comfortable with transparency!
+
+**Preferred qualifications:**
+
+   Experience designing, implementing, and maintaining scalable complex 
network applications.
+   Working experience with data processing pipelines.
+   Possess the confidence to refactor code and write unit-tests.
+   Familiarity with the challenges of developing and scaling data processing 
pipelines.
+   Familiarity with the network measurement field.
+   Experience with open-source software development, including working with 
distributed teams across different time-zones containing employees and 
volunteers of differing skill levels.
+   Basic familiarity with distributed version control systems.
+   Contributed significant chunks of code to multiple open-source projects in 
the past.
+   Be passionate about internet freedom and interested in contributing to it 
in a concrete way!
+
+**Other notes:**
+
+Academic degrees are great but not required if you have the right experience.
+
+You should be very good at working remotely at communicating with the team on 
a daily basis via Slack, IRC, instant messaging, email, and issue trackers.
+
+Salary negotiable.
+
+**How to apply:**
+
+Please email a *PDF* of your resume/CV, and a cover letter explaining how your 
qualifications and experience meet the requirements of this job description. 
Please include the reasons why you want to work on OONI. Please also include 
link to one or several code samples (of which you are authorized to share), and 
also your GitHub or GitLab profile, and three professional references.
+
+Email should be sent to jobs at openobservatory dot org with "OONI Backend 
Engineer" in the subject line.
+
+**About the project:**
+
+The Open Observatory of Network Interference (OONI) is a free software project 
under the Tor Project. OONI collects and processes network measurements with 
the aim of detecting network interferences, such as censorship, surveillance, 
and traffic manipulation. Since late 2012, OONI has collected millions of 
measurements across more than 90 countries around the world.
+
+The Tor Project, Inc.,

88 matches

Mail list logo