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

2017-08-05 Thread translation 
commit ed3ffbb7ffe1d929ae4b7dc667b7e77ff04ca2b3
Author: Translation commit bot 
Date:   Sun Aug 6 03:46:08 2017 +

Update translations for tails-greeter_completed
---
 zh_TW/zh_TW.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po
index 21423a82a..0a18598b7 100644
--- a/zh_TW/zh_TW.po
+++ b/zh_TW/zh_TW.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-10 12:27+0200\n"
-"PO-Revision-Date: 2017-06-18 01:51+\n"
+"PO-Revision-Date: 2017-08-06 03:31+\n"
 "Last-Translator: Agustín Wu \n"
 "Language-Team: Chinese (Taiwan) 
(http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"

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

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

2017-08-05 Thread translation 
commit 9965597ab0ec78c9da6ec6dd1b4902eb7f16bc4b
Author: Translation commit bot 
Date:   Sun Aug 6 03:46:03 2017 +

Update translations for tails-greeter
---
 zh_TW/zh_TW.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po
index 21423a82a..0a18598b7 100644
--- a/zh_TW/zh_TW.po
+++ b/zh_TW/zh_TW.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-10 12:27+0200\n"
-"PO-Revision-Date: 2017-06-18 01:51+\n"
+"PO-Revision-Date: 2017-08-06 03:31+\n"
 "Last-Translator: Agustín Wu \n"
 "Language-Team: Chinese (Taiwan) 
(http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed

2017-08-05 Thread translation 
commit a58cd391776c25d0227ed6e3b6f776a85cd0b89e
Author: Translation commit bot 
Date:   Sun Aug 6 03:49:34 2017 +

Update translations for tails-greeter-2_completed
---
 zh_TW/zh_TW.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po
index 39af2051c..eaf03aa83 100644
--- a/zh_TW/zh_TW.po
+++ b/zh_TW/zh_TW.po
@@ -55,7 +55,7 @@ msgstr "偽裝成微軟 Windows 系統"
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspicion in public places."
-msgstr "這選項讓 Tails 看起來像 Microsoft Windows 
10。這可以讓您在公共場所時不受矚目。"
+msgstr "這選項功能可以讓 Tails 系統的外觀看起來類似微軟 
Windows 10 作業系統。這可以讓您在公共å 
´æ‰€ä½¿ç”¨æ™‚較不引人注意。"
 
 #. This string will never be displayed in the 1st version of the greeter.
 #: ../data/greeter.ui.h:12

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

[tor-commits] [translation/tails-greeter-2] Update translations for tails-greeter-2

2017-08-05 Thread translation 
commit 6efc3813d9ad469e074b05a12c245aaecb36e520
Author: Translation commit bot 
Date:   Sun Aug 6 03:49:30 2017 +

Update translations for tails-greeter-2
---
 zh_TW/zh_TW.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po
index 39af2051c..eaf03aa83 100644
--- a/zh_TW/zh_TW.po
+++ b/zh_TW/zh_TW.po
@@ -55,7 +55,7 @@ msgstr "偽裝成微軟 Windows 系統"
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspicion in public places."
-msgstr "這選項讓 Tails 看起來像 Microsoft Windows 
10。這可以讓您在公共場所時不受矚目。"
+msgstr "這選項功能可以讓 Tails 系統的外觀看起來類似微軟 
Windows 10 作業系統。這可以讓您在公共å 
´æ‰€ä½¿ç”¨æ™‚較不引人注意。"
 
 #. This string will never be displayed in the 1st version of the greeter.
 #: ../data/greeter.ui.h:12

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

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

2017-08-05 Thread translation 
commit 1415c77df320409deeffa19e33fcda6058812f62
Author: Translation commit bot 
Date:   Sun Aug 6 03:45:33 2017 +

Update translations for https_everywhere
---
 zh_TW/https-everywhere.dtd | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/zh_TW/https-everywhere.dtd b/zh_TW/https-everywhere.dtd
index 1e1084c6b..823f26ed1 100644
--- a/zh_TW/https-everywhere.dtd
+++ b/zh_TW/https-everywhere.dtd
@@ -24,22 +24,22 @@
 
 
 
-
-
-
+
+
+
 
 
 
 
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
 
 
 

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

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

2017-08-05 Thread translation 
commit 0a72f8e79ebbc2404d23238f7fcb68aaa485eb88
Author: Translation commit bot 
Date:   Sun Aug 6 03:45:42 2017 +

Update translations for https_everywhere_completed
---
 zh_TW/https-everywhere.dtd | 13 +
 1 file changed, 13 insertions(+)

diff --git a/zh_TW/https-everywhere.dtd b/zh_TW/https-everywhere.dtd
index 3cde59d0b..823f26ed1 100644
--- a/zh_TW/https-everywhere.dtd
+++ b/zh_TW/https-everywhere.dtd
@@ -24,9 +24,22 @@
 
 
 
+
+
+
+
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 

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

[tor-commits] [nyx/master] Change graphed default to bytes

2017-08-05 Thread atagar 
commit d0f8702a25517ae44a09a3e7bd4e768c613cadf9
Author: Damian Johnson 
Date:   Sat Aug 5 09:33:30 2017 -0700

Change graphed default to bytes

Not the first time we've changed this. Unfortunately regardless of if we go
with bits or bytes somebody will be confused, but from irc contacts over the
years it's clear most folks expect measurements to be in bytes. Most other
tools choose bytes so lets be consistent with them.
---
 nyx/panel/graph.py   |  4 ++--
 nyxrc.sample |  2 +-
 web/changelog/index.html |  1 +
 web/index.html   | 11 ++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py
index 8271b06..fc1e7cb 100644
--- a/nyx/panel/graph.py
+++ b/nyx/panel/graph.py
@@ -81,7 +81,7 @@ CONFIG = conf.config_dict('nyx', {
   'graph_stat': GraphStat.BANDWIDTH,
   'max_graph_width': 300,  # we need some sort of max size so we know how much 
graph data to retain
   'show_accounting': True,
-  'show_bytes': False,
+  'show_bits': False,
   'show_connections': True,
 }, conf_handler)
 
@@ -708,4 +708,4 @@ def _size_label(byte_count, decimal = 1):
   or bytes.
   """
 
-  return str_tools.size_label(byte_count, decimal, is_bytes = 
CONFIG['show_bytes'])
+  return str_tools.size_label(byte_count, decimal, is_bytes = not 
CONFIG['show_bits'])
diff --git a/nyxrc.sample b/nyxrc.sample
index 508c87f..8b87bca 100644
--- a/nyxrc.sample
+++ b/nyxrc.sample
@@ -8,7 +8,7 @@
 
 data_directory ~/.nyx   # Caching location, can be set to 'disabled'.
 tor_chroot /path# Chroot jail tor resides within if there is one. (*)
-show_bytes false# Bandwidth rate as bytes if true, bits otherwise.
+show_bits false # Bandwidth rate as bits if true, bytes otherwise.
 confirm_quit true   # Confirm before quitting.
 color_interface true# Uses color in our interface.
 color_override none # Replaces instances of color with this hue.
diff --git a/web/changelog/index.html b/web/changelog/index.html
index b0ee9b7..e623751 100644
--- a/web/changelog/index.html
+++ b/web/changelog/index.html
@@ -66,6 +66,7 @@
 Graph
   
 Graph prepopulation no longer requires shifting to 15 minute 
intervals
+Graphing bandwith as bytes by default, rather than bits
   
 
 
diff --git a/web/index.html b/web/index.html
index d330554..5c2ab82 100644
--- a/web/index.html
+++ b/web/index.html
@@ -212,13 +212,22 @@
   
 
 
+
+  Is bandwidth graphed in bits or bytes?
+  
+Bytes. Most tools measure in bytes so for consistency we 
do the same. Unfortunately hosting providers advertise in bits to inflate their 
numbers ("5 Mbit connection"). If graphs show just one eighth of what you 
expect this is why.
+To graph in bits rather than bytes add the following to your 
nyxrc...
+show_bits true
+  
+
+
 
   Why are there borders like 'mwj'?
   
 
 When alternate character support (ACS) http://invisible-island.net/ncurses/ncurses.faq.html#no_line_drawing;>is 
unavailable borders become characters like the picture above. This is a 
terminal bug.
 Unfortunately there doesn't seem to be a way for Nyx to 
automatically detect this. However, when it happens this can be easily 
corrected. Simply run reset. To tell Nyx not to use ACS borders simply 
add the following to your nyxrc...
-features.acsSupport false
+acs_support false
   
 
 



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

[tor-commits] [nyx/master] Discuss our nyxrc in the FAQ

2017-08-05 Thread atagar 
commit 01f33401f593ebcee4dfb3b991370d571b2d6c56
Author: Damian Johnson 
Date:   Sat Aug 5 17:12:15 2017 -0700

Discuss our nyxrc in the FAQ

I'd put good money that just about nobody even knows nyx *can* have a 
nyxrc. On
one hand this is a pity, but on the other 98% of users really wouldn't find 
it
useful. As such the FAQ is probably the right spot.
---
 setup.py |  2 +-
 web/index.html   | 16 
 nyxrc.sample => web/nyxrc.sample |  0
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index e9a0fa5..f47f915 100644
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ class NyxInstaller(install):
 
 self.install_bin_script('run_nyx', os.path.join(self.install_scripts, 
'nyx'))
 self.install_file('man page', 'nyx.1', self.man_page)
-self.install_file('nyxrc sample', 'nyxrc.sample', self.sample_path)
+self.install_file('web/nyxrc sample', 'nyxrc.sample', self.sample_path)
 
   def install_bin_script(self, source, dest):
 # Install our bin script. We do this ourselves rather than with the setup()
diff --git a/web/index.html b/web/index.html
index 5c2ab82..a010ed4 100644
--- a/web/index.html
+++ b/web/index.html
@@ -144,6 +144,22 @@
   
 
 
+
+  How can I configure Nyx?
+  
+Like most terminal applications Nyx can be customized through a 
configuration file. By default ~/.nyx/nyxrc, though you can specify one 
with nyx --config /path/to/nyxrc.
+Configurations are a simple series of key/value pairs. For 
example...
+
+
+acs_support false
+color_override blue  # make our UI predominately blue
+logged_events BW, NOTICE, WARN, ERR
+
+
+For available options see our sample 
nyxrc.
+  
+
+
 
   How can I report a bug?
   
diff --git a/nyxrc.sample b/web/nyxrc.sample
similarity index 100%
rename from nyxrc.sample
rename to web/nyxrc.sample

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

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

2017-08-05 Thread translation 
commit fa3d980a9e3a959a51ff22b311daeddf70eb
Author: Translation commit bot 
Date:   Sun Aug 6 00:15:31 2017 +

Update translations for https_everywhere
---
 da/https-everywhere.dtd | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/da/https-everywhere.dtd b/da/https-everywhere.dtd
index 6667ebe69..5dd8d50b7 100644
--- a/da/https-everywhere.dtd
+++ b/da/https-everywhere.dtd
@@ -24,21 +24,21 @@
 
 
 
-
-
-
+
+
+
 
 
 
 
-
-
-
+
+
+
 
-
+
 
-
-
+
+
 
 
 

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

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2017-08-05 Thread translation 
commit 24e6f7cf7ffa4129203a2c55ace4aeb159558df7
Author: Translation commit bot 
Date:   Sat Aug 5 17:15:42 2017 +

Update translations for liveusb-creator
---
 uk/uk.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/uk/uk.po b/uk/uk.po
index 1629c4597..9606f8967 100644
--- a/uk/uk.po
+++ b/uk/uk.po
@@ -8,15 +8,15 @@
 # LinuxChata, 2014-2015
 # Maxim Baturov , 2017
 # Maxim Dziumanenko , 2010
-# Vira Motorko , 2015
+# Vira Motorko , 2015,2017
 # Андрій Бандура , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-30 13:14+0200\n"
-"PO-Revision-Date: 2017-07-19 10:30+\n"
-"Last-Translator: Maxim Baturov \n"
+"PO-Revision-Date: 2017-08-05 16:57+\n"
+"Last-Translator: Vira Motorko \n"
 "Language-Team: Ukrainian 
(http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -179,7 +179,7 @@ msgstr "Непідтримуваний пристрій 
'%(device)s', будь 
 
 #: ../tails_installer/creator.py:952
 msgid "Trying to continue anyway."
-msgstr "Спроба все одно продовжити."
+msgstr "Спроба все одно продовжити. "
 
 #: ../tails_installer/creator.py:961 ../tails_installer/creator.py:1354
 msgid "Verifying filesystem..."

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

[tor-commits] [research-web/master] the request and response for the first research safety board case

2017-08-05 Thread arma 
commit 0ed61edd319c7715c6b41707abaa33a2548bff88
Author: Roger Dingledine 
Date:   Sat Aug 5 16:38:31 2017 -0400

the request and response for the first research safety board case
---
 htdocs/trsb/2016-01-request.txt  | 195 +++
 htdocs/trsb/2016-01-response.txt |  45 +
 2 files changed, 240 insertions(+)

diff --git a/htdocs/trsb/2016-01-request.txt b/htdocs/trsb/2016-01-request.txt
new file mode 100644
index 000..47e3ff4
--- /dev/null
+++ b/htdocs/trsb/2016-01-request.txt
@@ -0,0 +1,195 @@
+
+Date: Thu, 18 Aug 2016 10:47:45 -0700
+From: David Fifield 
+To: Roger Dingledine 
+Cc: Lynn Tsai 
+Subject: Tor Research Safety Board: default bridge reachability
+
+We're seeking comments on a continuation of our research on the blocking
+of default Tor Browser bridges. What we've done so far on this subject
+is covered in our FOCI 2016 paper, "Censors' Delay in Blocking
+Circumvention Proxies":
+https://www.bamsoftware.com/proxy-probe/
+
+The short summary of what we want to do is to greatly expand our
+measurement locations, by using existing platforms such as ICLab, OONI,
+or RIPE Atlas. We want to start doing traceroutes in addition to TCP
+reachability. We want to control how new bridges are introduced, in
+order to test specific hypotheses, such as whether there is a difference
+in detection between stable and alpha.
+
+
+== What are you trying to learn, and why is that useful for the world?
+   That is, what are the hoped-for benefits of your experiment?
+
+1. Where the default bridges are blocked, globally. We know that China
+   (eventually) blocks them, and Iran (currently) does not; but we don't
+   know the situation anywhere else.
+2. In places where the default bridges get blocked, the dynamics of
+   blocking, such as how long it takes, its granularity (IP only or
+   IP/port), and whether blocks are eventually removed.
+3. How bridge addresses are discovered (e.g. through traffic analysis,
+   tickets, or source code), and how they are extracted (e.g. manually
+   or through automated parsing).
+
+The overarching, abstract benefit of the experiment is a better
+understanding of censorship, leading to the development of better
+informed circumvention.
+
+The latest bridge users' guide
+(https://blog.torproject.org/blog/breaking-through-censorship-barriers-even-when-tor-blocked)
+recommends using meek to users in China, because obfs4 is blocked. This
+research would let us know whether to expand that advice beyond China.
+
+By comparing reachability timelines across many censors, we may find
+evidence for or against censors sharing a common data source. For
+example, if two countries block a set of bridges at the same moment, it
+is probably because there is something in common in their detection.
+
+We may uncover specific operational weaknesses of censors that can be
+exploited. To choose an invented but plausible scenario, maybe a censor
+only does black-box testing of new bundles on the day of release: in
+that case, the browser could avoid connecting to a subset of bridges
+until after a certain date.
+
+If we are able to reachability publish data online on a frequently
+updated basis, someone could use it to build a Weather-like service that
+notifies operators of default bridges when their bridge stops running.
+This happened a few times already: some of the default bridges stopped
+running because of lost iptables rules after a reboot, and we were the
+first to notice, only because we were looking at the graphs every once
+in a while. (This would not always be possible using only Collector
+data, because for example the bridge might be running, but its obfs4
+port closed because of a firewall misconfiguration.)
+
+
+== What exactly is your plan? That is, what are the steps of your
+   experiment, what will you collect, how will you keep it safe, and so
+   on.
+
+So far, we have only run from a handful of VPSes, never more than 4 at a
+time. We only had visibility into the U.S., China, and Iran. We
+carefully watched for the introduction of new obfs4 bridges (in some
+cases being privately informed in advance), and added them to a probe
+list, which got probed every 20 minutes by a cron job on the VPSes.
+
+We want to greatly expand our probe sites, by using existing measurement
+platforms such as ICLab, OONI, or RIPE Atlas. We hope to be able to
+measure from dozens or hundreds of diverse locations. We have already
+talked to ICLab and they are willing to probe our destinations from
+their endpoints, which mostly consist of commercial VPNs in various
+countries. The probes will consist of periodic TCP connections to Tor
+Browser default obfs4 bridges (released and not-yet-released) and
+control destinations. We want to start doing traceroutes as well.
+
+We expect that the TCP reachability data we collect will be similar to
+what we have collected so far. It looks

[tor-commits] [metrics-web/master] Add bridge descriptors specification.

2017-08-05 Thread karsten 
commit adba0625df154720be6e36c699b336ff588a5179
Author: Karsten Loesing 
Date:   Sat Jul 22 14:48:31 2017 +0200

Add bridge descriptors specification.

Implements #22827.
---
 .../torproject/metrics/web/DataSourceServlet.java  |  43 +
 website/src/main/resources/etc/web.xml |  11 +
 website/src/main/resources/spec/README.txt |  15 +
 .../src/main/resources/spec/bridge-descriptors.xml | 700 
 website/src/main/resources/spec/convert.awk|  46 ++
 website/src/main/resources/spec/convert.sh |   6 +
 .../resources/web/WEB-INF/bridge-descriptors.jsp   | 913 +
 7 files changed, 1734 insertions(+)

diff --git 
a/website/src/main/java/org/torproject/metrics/web/DataSourceServlet.java 
b/website/src/main/java/org/torproject/metrics/web/DataSourceServlet.java
new file mode 100644
index 000..f6605c1
--- /dev/null
+++ b/website/src/main/java/org/torproject/metrics/web/DataSourceServlet.java
@@ -0,0 +1,43 @@
+/* Copyright 2017 The Tor Project
+ * See LICENSE for licensing information */
+
+package org.torproject.metrics.web;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class DataSourceServlet extends AnyServlet {
+
+  private static final long serialVersionUID = -8220752089313109128L;
+
+  private Map specFiles = new HashMap<>();
+
+  @Override
+  public void init() throws ServletException {
+super.init();
+this.specFiles.put("/bridge-descriptors.html",
+new String[] { "/bridge-descriptors.jsp", "Tor Bridge Descriptors" });
+  }
+
+  @Override
+  public void doGet(HttpServletRequest request,
+  HttpServletResponse response) throws IOException, ServletException {
+String requestedPage = request.getRequestURI();
+for (Map.Entry specFile : this.specFiles.entrySet()) {
+  if (requestedPage.endsWith(specFile.getKey())) {
+request.setAttribute("categories", this.categories);
+request.setAttribute("breadcrumb", specFile.getValue()[1]);
+request.getRequestDispatcher("WEB-INF" + specFile.getValue()[0])
+.forward(request, response);
+return;
+  }
+}
+response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+  }
+}
+
diff --git a/website/src/main/resources/etc/web.xml 
b/website/src/main/resources/etc/web.xml
index d19777f..38a30bb 100644
--- a/website/src/main/resources/etc/web.xml
+++ b/website/src/main/resources/etc/web.xml
@@ -284,6 +284,17 @@
   
 
   
+DataSourceServlet
+
+  org.torproject.metrics.web.DataSourceServlet
+
+  
+  
+DataSourceServlet
+/bridge-descriptors.html
+  
+
+  
 CollecTorServlet
 
   org.torproject.metrics.web.CollecTorServlet
diff --git a/website/src/main/resources/spec/README.txt 
b/website/src/main/resources/spec/README.txt
new file mode 100644
index 000..652eb7b
--- /dev/null
+++ b/website/src/main/resources/spec/README.txt
@@ -0,0 +1,15 @@
+This directory contains data source specifications.
+
+The notation used in these documents is still less formal than it could be.
+Maybe we can use ABNF which is even supported to some extend by xml2rfc. But
+even then we may want to introduce a set of (standard) operations for
+binary/string/crypto operations.
+
+It might be useful to focus on formats that can easily be processed by grammar
+based parser generators like ANTLR. We tried that and spent a day or two on
+ANTLR, and then gave up, figuring there are lower-hanging fruit on this
+specification tree. Maybe later.
+
+We might even be able to reuse that set in other specifications like
+dir-spec.txt or the yet-to-be-written original bridge descriptors 
specification.
+
diff --git a/website/src/main/resources/spec/bridge-descriptors.xml 
b/website/src/main/resources/spec/bridge-descriptors.xml
new file mode 100644
index 000..f30056f
--- /dev/null
+++ b/website/src/main/resources/spec/bridge-descriptors.xml
@@ -0,0 +1,700 @@
+
+
+
+
+
+
+
+
+
+
+  
+  
+  
+  
+]>
+http://purl.org/net/xml2rfc/ext;>
+  
+Tor bridge descriptors
+  
+  
+
+  Bridges and the bridge authority publish bridge descriptors that are
+  used by censored clients to connect to the network.
+  We aim for publishing all network directory data for informational and
+  statistical purposes.
+  We cannot, however, make bridge descriptors publicly available in the 
same
+  way as we publish relay descriptors, because that would defeat the 
purpose
+  of making bridges hard to enumerate for censors.
+  We therefore sanitize bridge descriptors by removing all potentially
+  identifying information and then publish sanitized versions.
+  The purpose of this document is to specify the document format of
+  sanitized bridge

[tor-commits] [metrics-web/master] Link to new Tor bridge descriptors specification.

2017-08-05 Thread karsten 
commit 8e15643cbcce09add914fe98905ec2117cf58b7d
Author: Karsten Loesing 
Date:   Sat Aug 5 22:23:04 2017 +0200

Link to new Tor bridge descriptors specification.
---
 .../src/main/resources/web/WEB-INF/collector.jsp   | 83 +-
 website/src/main/resources/web/WEB-INF/sources.jsp | 11 +++
 2 files changed, 13 insertions(+), 81 deletions(-)

diff --git a/website/src/main/resources/web/WEB-INF/collector.jsp 
b/website/src/main/resources/web/WEB-INF/collector.jsp
index 4b37e5e..f57ccb8 100644
--- a/website/src/main/resources/web/WEB-INF/collector.jsp
+++ b/website/src/main/resources/web/WEB-INF/collector.jsp
@@ -366,89 +366,10 @@ descriptors, because that would defeat the purpose of 
making bridges hard
 to enumerate for censors.
 We therefore sanitize bridge descriptors by removing all potentially
 identifying information and publish sanitized versions here.
-The sanitizing steps are as follows:
+The sanitizing steps are specified in detail on a separate
+page.
 
 
-
-Replace bridge identities with their digests: Clients
-can request a bridge's current descriptor by sending its identity string
-to the bridge authority.
-This is a feature to make bridges on dynamic IP addresses useful.
-Therefore, the original identities (and anything that could be used to
-derive them) need to be removed from the descriptors.
-The bridge's RSA-based identity fingerprint is replaced with its SHA-1
-hash value, and the bridge's optional base64-encoded Ed25519 master key is
-replaced with its SHA-256 digest.
-The idea is to have a consistent replacement that remains stable over
-months or even years (without keeping a secret for a keyed hash
-function).
-Remove most cryptographic keys and signatures: It would be
-straightforward to learn about the bridge identity from the bridge's
-public key.
-Replacing keys by newly generated ones seemed to be unnecessary (and would
-involve keeping a state over months/years), so that most cryptographic
-keys and signatures have simply been removed.
-Replace IP address with IP address hash: Of course, IP
-addresses need to be sanitized, too.
-IPv4 addresses are replaced with 10.x.x.x with
-x.x.x being the 3 byte output of
-H(IP address | bridge identity | secret)[:3].
-The input IP address is the 4-byte long binary representation of
-the bridge's current IP address.
-The bridge identity is the 20-byte long binary representation of
-the bridge's long-term identity fingerprint.
-The secret is a 31-byte long secure random string that changes
-once per month for all descriptors and statuses published in that month.
-H() is SHA-256.
-The [:3] operator means that we pick the 3 most significant bytes
-of the result.
-IPv6 addresses are replaced with [fd9f:2e19:3bcf::xx:]
-with xx: being the hex-formatted 3 byte output of a similar
-hash function as described for IPv4 addresses.
-The only differences are that the input IP address is 16 bytes
-long and the secret is only 19 bytes long.
-Replace TCP port with TCP port hash: It may be less obvious
-that TCP ports need to be sanitized, but an unusual TCP port used by a
-high-value bridge might still stand out and provide yet another way to
-locate and block the bridge.
-Therefore, each non-zero TCP port is replaced with a number in the range
-from 49152 to 65535 that is the result of
-H(port | bridge identity | secret)[:2] / 2^2 + 2^15 + 2^14
-written as decimal number.
-The input port is the 2-byte long binary representation of the
-TCP port.
-The bridge identity is the 20-byte long binary representation of
-the bridge's long-term identity fingerprint.
-The secret is a 33-byte long secure random string that changes
-once per month for all descriptors and statuses published in that month.
-H() is SHA-256.
-The [:2] operator means that we pick the 2 most significant bytes
-of the result.
-The subsequent integer division and additions make sure that sanitized
-ports are in the range from 49152 to 65535 which is reserved for private
-services.
-All operations assume inputs to be in network byte order.
-TCP ports that are 0 in the original descriptor are left unchanged.
-Replace contact information: If there is contact information in
-a descriptor, the contact line is changed to
-somebody.
-Remove pluggable transport addresses and arguments: Bridges may
-provide transports in addition to the onion-routing protocol and include
-information about these transports in their extra-info descriptors for
-BridgeDB.
-In that case, any IP addresses, TCP ports, or additional arguments are
-removed, only leaving in the supported transport names.
-Append descriptor digests: Descriptors are often referenced by
-their digest, but that is not possible anymore once their content has
-changed.
-As a workaround, sanitized descriptors contain a new line
-router-digest with the hex representation of the SHA-1 of the
-original descriptor digest excluding RSA signature andif the bridge
-uses an Ed25519 identitya new line

[tor-commits] [nyx/master] Correct 'bandwith' misspelling

2017-08-05 Thread atagar 
commit 8199b6777647f0777cca6262cb70e5a65151afa0
Author: Damian Johnson 
Date:   Sat Aug 5 22:14:59 2017 -0700

Correct 'bandwith' misspelling
---
 web/changelog/index.html | 2 +-
 web/index.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/changelog/index.html b/web/changelog/index.html
index e623751..de52df5 100644
--- a/web/changelog/index.html
+++ b/web/changelog/index.html
@@ -66,7 +66,7 @@
 Graph
   
 Graph prepopulation no longer requires shifting to 15 minute 
intervals
-Graphing bandwith as bytes by default, rather than bits
+Graphing bandwidth as bytes by default, rather than bits
   
 
 
diff --git a/web/index.html b/web/index.html
index a010ed4..4910c66 100644
--- a/web/index.html
+++ b/web/index.html
@@ -220,7 +220,7 @@ logged_events BW, NOTICE, WARN, ERR
   
 
 
-
+
   Why can't I see the bandwidth graph?
   
 Some terminals, such as screen sessions on Gentoo, apparently 
have a bug where highlighted space characters are not shown. Try running...

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

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

2017-08-05 Thread translation 
commit 896c3be43b15abaaab6d856feb0e1299c98df50e
Author: Translation commit bot 
Date:   Sat Aug 5 10:15:32 2017 +

Update translations for https_everywhere
---
 it/https-everywhere.dtd | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/it/https-everywhere.dtd b/it/https-everywhere.dtd
index 845d7aab0..74af510c7 100644
--- a/it/https-everywhere.dtd
+++ b/it/https-everywhere.dtd
@@ -24,22 +24,22 @@
 
 
 
-
-
-
+
+
+
 
 
 
 
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
 
 
 

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

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

2017-08-05 Thread translation 
commit f9a5a8a20ae0b008fc573723effe1d2c8a2a7c0f
Author: Translation commit bot 
Date:   Sat Aug 5 10:15:42 2017 +

Update translations for https_everywhere_completed
---
 it/https-everywhere.dtd | 13 +
 1 file changed, 13 insertions(+)

diff --git a/it/https-everywhere.dtd b/it/https-everywhere.dtd
index a1c600d4f..74af510c7 100644
--- a/it/https-everywhere.dtd
+++ b/it/https-everywhere.dtd
@@ -24,9 +24,22 @@
 
 
 
+
+
+
+
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 

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

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

2017-08-05 Thread translation 
commit 2c6b3a7c5a0c2730e56b30dbfcf1f3887da1ea37
Author: Translation commit bot 
Date:   Sat Aug 5 11:45:32 2017 +

Update translations for https_everywhere
---
 pt_BR/https-everywhere.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd
index 07698758f..e4748fca6 100644
--- a/pt_BR/https-everywhere.dtd
+++ b/pt_BR/https-everywhere.dtd
@@ -34,11 +34,11 @@
 
 
 
-
-
+
+
 
 
-
+
 
 
 

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

[tor-commits] [nyx/master] Limit FAQ cursor to question

2017-08-05 Thread atagar 
commit 44430d082c41d19d67bccb2f185904c43bbac130
Author: Damian Johnson 
Date:   Sat Aug 5 08:44:31 2017 -0700

Limit FAQ cursor to question

Only showing the finger cursor when on the clickable question. This was
mistakenly applied to the right, as well as some elements it contained too.
---
 web/styles.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/styles.css b/web/styles.css
index a4421fe..fd92867 100644
--- a/web/styles.css
+++ b/web/styles.css
@@ -171,20 +171,19 @@ FAQ Page
 }
 
 .questions li {
-  cursor: pointer;
   margin: 0px;
   padding: 0px 0px 5px 0px;
   text-align: left;
 }
 
 .questions span {
+  cursor: pointer;
   color: #302000;
   font-size: 18px;
   font-weight: bold;
 }
 
 .answer {
-  cursor: default;
   height: 0px;
   overflow: hidden;
   padding: 0px;

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

[tor-commits] [nyx/master] Hide PyPI download options for now

2017-08-05 Thread atagar 
commit 0c21dec27b36dbd75675536ef7b04b0efcf4ce6e
Author: Damian Johnson 
Date:   Sat Aug 5 08:41:57 2017 -0700

Hide PyPI download options for now

Haven't actually uploaded to pypi yet, and won't until our release (or at 
least
the beta). Dropping this from the download page for now to avoid confusion.
---
 web/index.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/index.html b/web/index.html
index b65800b..d330554 100644
--- a/web/index.html
+++ b/web/index.html
@@ -307,6 +307,7 @@ sudo python setup.py install
 
   
 
+  
 
   
 http://packages.debian.org/sid/tor-arm; id="debian">



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