date:20170518

[tor-commits] [torspec/master] easy and hopefully uncontroversial fixes to guard-spec

2017-05-18 Thread arma

commit 4daf3db96ce162ca25d05e77a849e774579898c4
Author: Roger Dingledine 
Date:   Fri May 19 00:24:48 2017 -0400

easy and hopefully uncontroversial fixes to guard-spec

please do feel free to look through and make sure i didn't break anything
though :)
---
 guard-spec.txt | 39 ---
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/guard-spec.txt b/guard-spec.txt
index dc9f865..267edab 100644
--- a/guard-spec.txt
+++ b/guard-spec.txt
@@ -18,11 +18,11 @@
   sample of every user's traffic with probability 1.
 
   To prevent this from happening, Tor clients choose a small number
-  of guard nodes (currently 3).  These guard nodes are the only
+  of guard nodes (e.g. 3).  These guard nodes are the only
   nodes that the client will connect to directly.  If they are not
   compromised, the user's paths are not compromised.
 
-  This proposal outlines Tor's current guard selection algorithm,
+  This specification outlines Tor's guard selection algorithm,
   which tries to meet the following goals:
 
 - Heuristics and algorithms for determining how and which guards
@@ -35,7 +35,7 @@
   usability.
 
 - Tor should make a best attempt at discovering the most
-  appropriate behaviour, with as little user input and
+  appropriate behavior, with as little user input and
   configuration as possible.
 
 - Tor clients should discover usable guards without too much
@@ -109,7 +109,7 @@
required. An exit node is required if traffic will exit the Tor
network. Depending on its configuration, a relay listed in a
consensus could be used for any of these roles. However, this
-   proposal defines how entry guards specifically should be selected and
+   specification defines how entry guards specifically should be selected and
managed, as opposed to middle or exit nodes.
 
3.1.1 Entry guard selection
@@ -144,7 +144,8 @@
 
Middle nodes are selected at random from relays listed in the
latest consensus, weighted by bandwidth. Exit nodes are chosen
-   similarly but restricted to relays with an exit policy.
+   similarly but restricted to relays with a sufficiently permissive
+   exit policy.
 
3.2 Circuit Building
 
@@ -222,7 +223,7 @@
We require that {SAMPLED_GUARDS} contain at least
{MIN_FILTERED_SAMPLE} guards from the consensus (if possible),
but not more than {MAX_SAMPLE_THRESHOLD} of the number of guards
-   in the consensus, and not more then {MAX_SAMPLE_SIZE} in total.
+   in the consensus, and not more than {MAX_SAMPLE_SIZE} in total.
(But if the maximum would be smaller than {MIN_FILTERED_SAMPLE}, we
set the maximum at {MIN_FILTERED_SAMPLE}.)
 
@@ -274,7 +275,7 @@
- It is a member of {SAMPLED_GUARDS}, with {IS_LISTED} set to
  true.
- It is not disabled because of path bias issues.
-   - It is not disabled because of ReachableAddress police,
+   - It is not disabled because of ReachableAddresses policy,
  the ClientUseIPv4 setting, the ClientUseIPv6 setting,
  the FascistFirewall setting, or some other
  option that prevents using some addresses.
@@ -316,7 +317,7 @@
   order of using them.  It is a subset of {SAMPLED_GUARDS}.  For
   each guard in this list, we store persistently:
 
-  - {pvar:IDENTITY} Its fingerprint
+  - {pvar:IDENTITY} Its fingerprint.
 
   - {pvar:CONFIRMED_ON_DATE} When we added this guard to
 {CONFIRMED_GUARDS}.
@@ -346,7 +347,7 @@
{is_pending}==true guards have higher priority.
 
  * Among those, the guard with earlier {last_tried_connect} time
-   have higher priority.
+   has higher priority.
 
  * Finally, among guards that do not appear in
{CONFIRMED_GUARDS} with {is_pending==false}, all have equal
@@ -509,10 +510,10 @@
When a circuit fails in a way that makes us conclude that a guard
is not reachable, we take the following steps:
 
-  * We set the guard's {is_reachable} status to .  If it had
+  * Set the guard's {is_reachable} status to .  If it had
 {is_pending} set to true, we make it non-pending.
 
-  * We close the circuit, of course.  (This removes it from
+  * Close the circuit, of course.  (This removes it from
 consideration by the algorithm in [UPDATE_WAITING].)
 
   * Update the list of waiting circuits.  (See [UPDATE_WAITING]
@@ -580,7 +581,7 @@
 
We run this procedure periodically:
 
-   * If any circuit stays is 
+   * If any circuit stays in 
  for more than {NONPRIMARY_GUARD_IDLE_TIMEOUT} seconds,
  time it out.
 
@@ -597,7 +598,7 @@
them after all if the  circuit goes down before
{NONPRIMARY_GUARD_IDLE_TIMEOUT} seconds.
 
-4.10.  Whenever we get a new consensus. [Section:ON_CONSENSUS]
+4.10. Whenever we get a new consensus. [Section:ON_CONSENSUS]
 
We update {GUARDS}.
 
@@ -619,7 +620,7 @@
 4.11. Deciding whether to generate a new circuit.

[tor-commits] [torspec/master] minor touch-ups on the glossary

2017-05-18 Thread arma

commit 1c74eb5cea30b4ecfff957bc38fde032b3f5784f
Author: Roger Dingledine 
Date:   Fri May 19 00:11:27 2017 -0400

minor touch-ups on the glossary

the only exciting one is that we don't use guards to defend against
"enumeration attacks" -- i'm not quite sure what an enumeration attack
is, but it sounds like something where the guard is able to make a list
of users, and where having that list is bad news in itself. that's not
quite what guards are for.
---
 glossary.txt | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/glossary.txt b/glossary.txt
index e1a0f0a..dda94e0 100644
--- a/glossary.txt
+++ b/glossary.txt
@@ -42,7 +42,7 @@ citing them authoritatively. ;)
 
   Guard relay: A relay that a client uses as its entry for a longer
   period of time.  Guard relays are rotated more slowly to prevent
-  enumeration attacks.
+  attacks that can come from being exposed to too many guards.
 
   Bridge: A relay intentionally not listed in the public Tor
   consensus, with the purpose of circumventing entities (such as
@@ -54,7 +54,7 @@ citing them authoritatively. ;)
   Any relay will act as a directory cache, if its bandwidth is high enough.
 
   Rendezvous point: A relay connecting a client to a hidden service.
-  Each party will builds a three-hop circuit, meeting at the
+  Each party builds a three-hop circuit, meeting at the
   rendezvous point.
 
2.2 Client, aka OP (onion proxy)
@@ -66,9 +66,9 @@ citing them authoritatively. ;)
 Directory Authority: Nine total in the Tor network, operated by
 trusted individuals. Directory authorities define and serve the
 consensus document, defining the "state of the network." This document
-contains a "router status" section for every relays currently
+contains a "router status" section for every relay currently
 in the network. Directory authorities also serve router descriptors,
-extra info documents, microdescriptors, and the microdescriptor consensus,
+extra info documents, microdescriptors, and the microdescriptor consensus.
 
 Bridge Authority: One total. Similar in responsibility to directory
 authorities, but for bridges.
@@ -91,7 +91,7 @@ citing them authoritatively. ;)
 
An established path through the network, where cryptographic keys
are negotiated using the ntor protocol or TAP (Tor Authentication
-   Protocol (deprecated) with each hop. Circuits can differ in length
+   Protocol (deprecated)) with each hop. Circuits can differ in length
depending on their purpose. See also Leaky Pipe Topology.
 
 Origin Circuit -
@@ -113,8 +113,8 @@ citing them authoritatively. ;)
 
2.8 Descriptor: Each descriptor represents information about one
 relay in the Tor network. The descriptor includes the relay's IP
-address, public key fingerprint, along with other data. Relays send
-descriptors to directory authorities, who will vote and publish a
+address, public keys, and other data. Relays send
+descriptors to directory authorities, who vote and publish a
 summary of them in the network consensus.
 
 3.0 Tor network protocols

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

[tor-commits] [torspec/master] clarify a "Consensus methods 11 and before" phrase that's been confusing me

2017-05-18 Thread arma

commit 3c2526c517c98f5ca0a8bb91ec85ca46a942fbee
Author: Roger Dingledine 
Date:   Fri May 19 00:08:27 2017 -0400

clarify a "Consensus methods 11 and before" phrase that's been confusing me
---
 dir-spec.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index a0494f0..2d4dda8 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -2493,9 +2493,9 @@
  authorities voted for that parameter. The values given are the
  low-median of all votes on that keyword.
 
- Consensus methods 11 and before, entries are given on the "params"
- line for every keyword on which any authority voted, the value given
- being the low-median of all votes on that keyword.
+ (In consensus methods 7 to 11 inclusive, entries were given on
+ the "params" line for every keyword on which *any* authority voted,
+ the value given being the low-median of all votes on that keyword.)
 
 "client-versions" and "server-versions" are sorted in ascending
  order; A version is recommended in the consensus if it is recommended

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

[tor-commits] [torspec/master] trivial whitespace fix

2017-05-18 Thread arma

commit 2107d1198a0c93cf5d91fa6f6fa4698a61060aa7
Author: Roger Dingledine 
Date:   Fri May 19 00:02:16 2017 -0400

trivial whitespace fix
---
 dir-spec.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index 4c842e8..a0494f0 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -442,7 +442,7 @@
[Exactly once]
 
The time, in UTC, when this descriptor (and its corresponding
-   extra-info document if any)  was generated.
+   extra-info document if any) was generated.
 
 "fingerprint" fingerprint NL
 

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

[tor-commits] [depictor/master] Adjust the graph colors Per #22174

2017-05-18 Thread tom

commit 60d2794b4cf0587168c6f69d3a501d25a89e4c9a
Author: Tom Ritter 
Date:   Thu May 18 16:25:28 2017 -0500

Adjust the graph colors Per #22174
---
 graphs.py | 159 --
 1 file changed, 93 insertions(+), 66 deletions(-)

diff --git a/graphs.py b/graphs.py
index 0e2a94e..695d9b6 100755
--- a/graphs.py
+++ b/graphs.py
@@ -69,92 +69,119 @@ class GraphWriter(WebsiteWriter):
+ "  text-align: center;\n"
+ "  display: none;\n"
+ "}\n"
-   + ".auth1, .steelblue {\n"
-   + "  fill: none;\n"
-   + "  stroke: steelblue;\n"
-   + "  background-color: steelblue;\n"
+   + ".fallback_green {\n"
+   + "  fill: #1a9850;\n"
+   + "  stroke: #1a9850;\n"
+   + "  background-color: #1a9850;\n"
+ "  stroke-width: 1.5px;\n"
+ "}\n"
-   + ".steelblue {\n"
-   + "  fill: steelblue;\n"
+   + ".fallback_orange {\n"
+   + "  fill: #fdae61;\n"
+   + "  stroke: #fdae61;\n"
+   + "  background-color: #fdae61;\n"
+   + "  stroke-width: 1.5px;\n"
+ "}\n"
-   + ".auth2, .orange {\n"
-   + "  fill: none;\n"
-   + "  stroke: orange;\n"
-   + "  background-color: orange;\n"
+   + ".fallback_red {\n"
+   + "  fill: #d73027;\n"
+   + "  stroke: #d73027;\n"
+   + "  background-color: #d73027;\n"
+ "  stroke-width: 1.5px;\n"
+ "}\n"
-   + ".orange {\n"
-   + "  fill: orange;\n"
+   + ".bwauth_above {\n"
+   + "  fill: #984ea3;\n"
+   + "  stroke: #984ea3;\n"
+   + "  background-color: #984ea3;\n"
+   + "  stroke-width: 1.5px;\n"
+ "}\n"
-   + ".auth3, .limegreen {\n"
-   + "  fill: none;\n"
-   + "  stroke: limegreen;\n"
-   + "  background-color: limegreen;\n"
+   + ".bwauth_shared {\n"
+   + "  fill: #377eb8;\n"
+   + "  stroke: #377eb8;\n"
+   + "  background-color: #377eb8;\n"
+ "  stroke-width: 1.5px;\n"
+ "}\n"
-   + ".limegreen {\n"
-   + "  fill: limegreen;\n"
+   + ".bwauth_exclusive {\n"
+   + "  fill: #4daf4a;\n"
+   + "  stroke: #4daf4a;\n"
+   + "  background-color: #4daf4a;\n"
+   + "  stroke-width: 1.5px;\n"
+ "}\n"
-   + ".auth4, .green {\n"
-   + "  fill: none;\n"
-   + "  stroke: green;\n"
-   + "  background-color: green;\n"
+   + ".bwauth_below {\n"
+   + "  fill: #ff7f00;\n"
+   + "  stroke: #ff7f00;\n"
+   + "  background-color: #ff7f00;\n"
+ "  stroke-width: 1.5px;\n"
+ "}\n"
-   + ".green {\n"
-   + "  fill: green;\n"
+   + ".bwauth_unmeasured {\n"
+   + "  fill: #e41a1c;\n"
+   + "  stroke: #e41a1c;\n"
+   + "  background-color: #e41a1c;\n"
+   + "  stroke-width: 1.5px;\n"
+ "}\n"
-   + ".auth5, .red {\n"
+   + ".auth1 {\n"
+ "  fill: none;\n"
-   + "  stroke: red;\n"
-   + "  background-color: red;\n"
+   + "  stroke: #1f78b4;\n"
+   + "  background-color: #1f78b4;\n"
+ "  stroke-width: 1.5px;\n"
+ "}\n"
-   + ".red {\n"
-   + "  fill: red;\n"
+   + ".auth2 {\n"
+   + "  fill: none;\n"
+

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

2017-05-18 Thread translation

commit 32b19f609067d764ff88a99ec5b8e99e93efd130
Author: Translation commit bot 
Date:   Thu May 18 19:48:19 2017 +

Update translations for tor-browser-manual
---
 fa/fa.po | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/fa/fa.po b/fa/fa.po
index 10c2f07..6048338 100644
--- a/fa/fa.po
+++ b/fa/fa.po
@@ -42,6 +42,8 @@ msgid ""
 "Tor Browser uses the Tor network to protect your privacy and anonymity. "
 "Using the Tor network has two main properties:"
 msgstr ""
+"ÙØ±ÙÚ¯Ø± ØªÙØ± Ø¨Ø±Ø§Û ØÙØ§Ø¸Øª Ø§Ø² ØØ±ÛÙ Ø´Ø®ØµÛ Ù ÙØ§Ø´ÙØ§Ø³ 
Ø¨ÙØ¯Ù Ø´ÙØ§ Ø§Ø² Ø´Ø¨Ú©Ù ØªÙØ± Ø§Ø³ØªÙØ§Ø¯Ù ÙÛ "
+"Ú©ÙØ¯. Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² Ø´Ø¨Ú©Ù ØªÙØ± Ø¯Ø§Ø±Ø§Û Ø¯Ù Ø§ÙÙÛØª Ø§Ø³Øª 
: "
 
 #: about-tor-browser.page:18
 msgid ""
@@ -49,6 +51,9 @@ msgid ""
 " will not be able to track your internet activity, including the names and "
 "addresses of the websites you visit."
 msgstr ""
+"Ø³Ø±ÙÛØ³ Ø¯ÙÙØ¯Ù Ø§ÛÙØªØ±ÙØª Ø´ÙØ§ ÛØ§ Ú©Ø³Ø§ÙÛ Ú©Ù Ø¨Ù 
ØµÙØ±Øª ÙØÙÛ Ø§ØªØµØ§Ù Ø´ÙØ§ Ø±Ø§ ÙÛ Ø¨ÛÙÙØ¯, ÙÙÛ "
+"ØªÙØ§ÙÙØ¯ ÙØ¹Ø§ÙÛØª Ø§ÛÙØªØ±ÙØªÛ Ø´ÙØ§ Ø±Ø§ ÙØ³ÛØ±ÛØ§Ø¨Û 
Ú©ÙÙØ¯ Ú©Ù Ø´Ø§ÙÙ ÙØ§Ù ÙØ§, Ø¢Ø¯Ø±Ø³ ÙØ§ Ù Ø³Ø§ÛØª "
+"ÙØ§ÛÛ ÙØ³ØªÙØ¯ Ú©Ù Ø´ÙØ§ Ø¨Ø§Ø²Ø¯ÛØ¯ Ú©Ø±Ø¯Ù Ø§ÛØ¯"
 
 #: about-tor-browser.page:25
 msgid ""
@@ -57,6 +62,9 @@ msgid ""
 "real Internet (IP) address, and will not know who you are unless you "
 "explicitly identify yourself."
 msgstr ""
+"Ø§Ù¾Ø±Ø§ØªÙØ± ÙØ§Û Ø³Ø§ÛØª ÙØ§ Ù Ø³Ø±ÙÛØ³ ÙØ§ÛÛ Ú©Ù Ø´ÙØ§ 
Ø§Ø³ØªÙØ§Ø¯Ù ÙÛ Ú©ÙÛØ¯ Ù Ú©Ø³Ø§ÙÛ Ú©Ù Ø¢ÙÙØ§ Ø±Ø§ "
+"ÙØ´Ø§ÙØ¯Ù ÙÛ Ú©ÙÙØ¯, ÛÚ© Ø§ØªØµØ§Ù Ø§Ø² Ø´Ø¨Ú©Ù ØªÙØ± Ø¨Ø¬Ø§Û 
Ø§ÛÙØªØ±ÙØª Ø§ØµÙÛ ÛØ§ IP Ø§ØµÙÛ Ø´ÙØ§ Ø±Ø§ ÙÛ "
+"Ø¨ÛÙÙØ¯. Ù ÙÙÛ Ø¯Ø§ÙÙØ¯ Ø´ÙØ§ ÚÙ Ú©Ø³Û ÙØ³ØªÛØ¯ ÙÚ¯Ø± 
Ø¢ÙÚ©Ù Ø´ÙØ§ Ø®ÙØ¯ Ø±Ø§ Ø´ÙØ§Ø³Ø§ÛÛ Ú©ÙÛØ¯."
 
 #: about-tor-browser.page:34
 msgid ""
@@ -107,7 +115,7 @@ msgstr ""
 
 #: bridges.page:6
 msgid "Learn what bridges are and how to get them"
-msgstr ""
+msgstr "ÛØ§Ø¯ Ø¨Ú¯ÛØ±ÛØ¯ Ú©Ù Ù¾Ù ÙØ§ ÚÙ ÚÛØ²Û ÙØ³ØªÙØ¯ Ù 
ÚÚ¯ÙÙÙ Ø¨Ù Ø¯Ø³Øª ÙÛ Ø¢ÛÙØ¯"
 
 #: bridges.page:10
 msgid "Bridges"
@@ -244,6 +252,8 @@ msgid ""
 "Select âyesâ when asked if your Internet Service Provider blocks 
connections"
 " to the Tor network."
 msgstr ""
+"Ú¯Ø²ÛÙÙ \"Ø¨ÙÙ\" Ø±Ø§ Ø§ÙØªØ®Ø§Ø¨ Ú©ÙÛØ¯ ÙÙÚ¯Ø§ÙÛ Ú©Ù Ø³ÙØ§Ù 
Ø´Ø¯ ÚÙØ§ÙÚÙ Ø³Ø±ÙÛØ³ Ø¯ÙÙØ¯Ù Ø´Ø¨Ú©Ù Ø´ÙØ§, "
+"Ø§ØªØµØ§Ù ÙØ§ Ø¨Ù Ø´Ø¨Ú©Ù ØªÙØ± Ø±Ø§ ÙØ³Ø¯ÙØ¯ ÙÛ Ú©ÙØ¯"
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to

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

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

2017-05-18 Thread translation

commit fbbff0ee7d67bffa822a2268ccf6b1b830f4f2d0
Author: Translation commit bot 
Date:   Thu May 18 19:18:23 2017 +

Update translations for tor-browser-manual
---
 fa/fa.po | 36 +++-
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/fa/fa.po b/fa/fa.po
index 4689d52..10c2f07 100644
--- a/fa/fa.po
+++ b/fa/fa.po
@@ -30,6 +30,8 @@ msgstr "Ø§Ø¹ØªØ¨Ø§Ø±-ÙØªØ±Ø¬Ù"
 #: about-tor-browser.page:7
 msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
+"ÛØ§Ø¯ Ø¨Ú¯ÛØ±ÛØ¯ Ú©Ù ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø¨Ø±Ø§Û ÙØØ§ÙØ¸Øª Ø§Ø² 
ØØ±ÛÙ Ø´Ø®ØµÛ Ù ÙØ§Ø´ÙØ§Ø³ Ø¨ÙØ¯Ù Ø´ÙØ§ ÚÙ Ú©Ø§Ø± "
+"ÙÛØªÙØ§ÙØ¯ Ø¨Ú©ÙØ¯"
 
 #: about-tor-browser.page:10
 msgid "About Tor Browser"
@@ -397,6 +399,11 @@ msgid ""
 "after the name of the program â each one represents a different source from 
"
 "which to get the software. Your download will then begin."
 msgstr ""
+"ÙÙÚ¯Ø§ÙÛ Ú©Ù Ø³Ø§ØªÙØ±Û Ø¨Ø§Ø² Ø§Ø³Øª, Ø¨Ø± Ø±ÙÛ Ø²Ø¨Ø§Ù 
Ø¨Ø±Ú¯Ø²ÛØ¯Ù Ø®ÙØ¯ Ú©ÙÛÚ© Ú©ÙÛØ¯. ÛÚ© ÙÙØ±Ø³Øª Ø¨Ø§Ø² "
+"Ø®ÙØ§ÙØ¯ Ø´Ø¯ Ú©Ù Ø¯Ø§ÙÙÙØ¯ Ø²Ø¨Ø§Ù ÙÙØ¬ÙØ¯ Ø±Ø§ ÙØ±Ø§Ø± Ø¯Ø§Ø¯Ù 
Ø§Ø³Øª.  Ø·Ø¨Ù ÙØ§Ù Ø³ÛØ³ØªÙ Ø¹Ø§ÙÙ Ø®ÙØ¯, "
+"ÙØ±ÙØ¯Û Ø±Ø§ Ø§ÙØªØ®Ø§Ø¨ Ú©ÙÛØ¯. ÙÙ \"A\" ÛØ§ \"B\" Ø±Ø§ 
Ø§ÙØªØ®Ø§Ø¨ Ú©ÙÛØ¯ Ù¾Ø³ Ø§Ø² ÙØ§Ù Ø¨Ø±ÙØ§ÙÙ - ÙØ±"
+" Ú©Ø¯Ø§Ù ÙØ´Ø§Ù Ø¯ÙÙØ¯Ù ÛÚ© ÙÙØ¨Ø¹ ÙØ®ØªÙÙ ÙØ³ØªÙØ¯ Ú©Ù Ø§Ø² 
Ø¢Ù Ø¨Ø±Ø§Û Ø¯Ø±ÛØ§ÙØª ÙØ±Ù Ø§ÙØ²Ø§Ø± Ø§Ø³ØªÙØ§Ø¯Ù "
+"ÙÛ Ø´ÙØ¯. Ø³Ù¾Ø³ Ø¯Ø§ÙÙÙØ¯ Ø´ÙØ§ Ø´Ø±ÙØ¹ Ø®ÙØ§ÙØ¯ Ø´Ø¯"
 
 #: downloading.page:115
 msgid ""
@@ -417,11 +424,11 @@ msgstr ""
 
 #: first-time.page:7
 msgid "Learn how to use Tor Browser for the first time"
-msgstr ""
+msgstr "ÛØ§Ø¯ Ø¨Ú¯ÛØ±ÛØ¯ Ú©Ù ÚÚ¯ÙÙÙ Ø§Ø² ÙØ±ÙÚ¯Ø± ØªÙØ± Ø¨Ø±Ø§Û 
Ø§ÙÙÛÙ Ø¨Ø§Ø± Ø§Ø³ØªÙØ§Ø¯Ù Ú©ÙÛØ¯"
 
 #: first-time.page:10
 msgid "Running Tor Browser for the first time"
-msgstr ""
+msgstr "Ø¯Ø± ØØ§Ù Ø§Ø¬Ø±Ø§Û ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø¨Ø±Ø§Û Ø§ÙÙÛÙ Ø¨Ø§Ø±"
 
 #: first-time.page:12
 msgid ""
@@ -444,6 +451,8 @@ msgid ""
 "external ref='media/first-time/connect.png' "
 "md5='9d07068f751a3bfd274365a4ba8d90ca'"
 msgstr ""
+"Ø®Ø§Ø±Ø¬Û  ref='media/first-time/connect.png' "
+"md5='9d07068f751a3bfd274365a4ba8d90ca'"
 
 #: first-time.page:23
 msgid ""
@@ -454,6 +463,8 @@ msgid ""
 "Troubleshooting page for help solving "
 "the problem."
 msgstr ""
+"Ø¯Ø± Ø¨ÛØ´ØªØ± ÙÙØ§Ø±Ø¯, Ø§ÙØªØ®Ø§Ø¨ \"ÙØµÙ Ø´Ø¯Ù\" Ø¨Ù Ø´ÙØ§ 
Ø§Ø¬Ø§Ø²Ù Ø®ÙØ§ÙØ¯ Ø¯Ø§Ø¯ Ú©Ù Ø¨Ø¯ÙÙ ÙÛÚ Ù¾ÛÚ©Ø± Ø¨ÙØ¯Û Ø§Û Ø¨Ù 
Ø´Ø¨Ú©Ù ØªÙØ± ÙØµÙ Ø´ÙÛØ¯. ÛÚ© Ø¨Ø§Ø± Ú©ÙÛÚ© Ú©ÙÛØ¯, ÛÚ© ÙØ³ÙØª 
Ø§Ø·ÙØ§Ø¹Ø§Øª Ù¾Ø¯ÛØ¯Ø§Ø± ÙÛ Ø´ÙØ¯ Ú©Ù ÙØ´Ø§Ù Ø¯ÙÙØ¯Ù Ù¾ÛØ´ 
Ø±ÙØªÙ Ø¨Ø±Ø§Û ÙØµÙ Ø´Ø¯Ù Ø¨Ù ØªÙØ± Ø§Ø³Øª.  Ø§Ú¯Ø± Ø´ÙØ§ ÛÚ© 
Ø§ØªØµØ§Ù ÙØ³Ø¨ØªØ§ Ø³Ø±ÛØ¹ Ø¯Ø§Ø±ÛØ¯, Ø§ÙØ§ Ø§ÛÙ Ø§Ø·ÙØ§Ø¹Ø§Øª 
Ø¨ÙØ¸Ø± ÙÛØ±Ø³Ø¯ Ú©Ù Ø¯Ø± ÛÚ© ÙÙØ·Ù Ø§ÛØ³ØªØ§Ø¯Ù, Ø¨Ø±Ø§Û ØÙ 
Ø§ÛÙ ÙØ´Ú©Ù ÙÛÙÚ© Ø²ÛØ± Ø±Ø§ ÙØ´Ø§ÙØ¯Ù Ú©ÙÛØ¯\n"
+"Troubleshooting"
 
 #: first-time.page:33
 msgid "Configure"
@@ -528,6 +539,8 @@ msgstr "ÙØ´Ú©ÙØ§Øª Ø´ÙØ§Ø®ØªÙ Ø´Ø¯Ù"
 msgid ""
 "Tor needs your system clock (and your time zone) set to the correct time."
 msgstr ""
+"ØªÙØ± Ø¨Ø±Ø§Û ØªÙØ¸ÛÙ Ú©Ø±Ø¯Ù Ø²ÙØ§Ù Ø¯Ø±Ø³Øª Ø¨Ù Ø³Ø§Ø¹Øª Ø³ÛØ³ØªÙ
 Ø´ÙØ§ (Ù Ø³Ø§Ø¹Øª ÙÙØ·ÙÙ Ø´ÙØ§) ÙÛØ§Ø² "
+"Ø¯Ø§Ø±Ø¯."
 
 #: known-issues.page:19
 msgid ""
@@ -936,6 +949,8 @@ msgstr ""
 #: secure-connections.page:8
 msgid "Learn how to protect your data using Tor Browser and HTTPS"
 msgstr ""
+"ÛØ§Ø¯ Ø¨Ú¯ÛØ±ÛØ¯ Ú©Ù ÚÚ¯ÙÙÙ Ø§Ø² Ø¯Ø§Ø¯Ù ÙØ§Û ÙÙØ±Ø¯ 
Ø§Ø³ØªÙØ§Ø¯Ù Ø®ÙØ¯ Ø¯Ø± ÙØ±ÙÚ¯Ø± ØªÙØ± ÛØ§ HTTP ÙØ§ "
+"ÙØØ§ÙØ¸Øª Ú©ÙÛØ¯"
 
 #: secure-connections.page:12
 msgid "Secure Connections"
@@ -1000,11 +1015,11 @@ msgstr ""
 
 #: secure-connections.page:70
 msgid "The site being visited."
-msgstr ""
+msgstr "Ø§ÛÙ Ø³Ø§ÛØª Ø¯Ø± ØØ§Ù Ø¨Ø§Ø²Ø¯ÛØ¯ Ø´Ø¯Ù Ø§Ø³Øª"
 
 #: secure-connections.page:81
 msgid "Username and password used for authentication."
-msgstr ""
+msgstr "ÙØ§Ù Ú©Ø§Ø±Ø¨Ø±Û Ù Ø±ÙØ² Ø¹Ø¨ÙØ± Ø§Ø³ØªÙØ§Ø¯Ù Ø´Ø¯Ù Ø¨Ø±Ø§Û 
Ø§ØØ±Ø§Ø² ÙÙÛØª"
 
 #: secure-connections.page:92
 msgid "Data being transmitted."
@@ -1208,7 +1223,7 @@ msgstr ""
 
 #: troubleshooting.page:6
 msgid "What to do if Tor Browser doesnât work"
-msgstr ""
+msgstr "ÚÙ Ú©ÙÛÙ Ø§Ú¯Ø± ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ú©Ø§Ø± ÙÚ©Ø±Ø¯Ø"
 
 #: troubleshooting.page:12
 msgid ""
@@ -1232,6 +1247,7 @@ msgid ""
 "Your computerâs system clock must be set correctly, or Tor will not be able 
"
 "to connect."
 msgstr ""
+"Ø³Ø§Ø¹Øª Ú©Ø§ÙÙ¾ÛÙØªØ± Ø´ÙØ§ Ø¨Ø§ÛØ¯ Ø¯Ø±Ø³Øª ØªÙØ¸ÛÙ Ø´ÙØ¯, ÛØ§ 
ØªÙØ± ÙÙÙÙ Ø¨Ù ÙØµÙ Ø´Ø¯Ù ÙØ´Ø¯Ù Ø§Ø³Øª"
 
 #: troubleshooting.page:35
 msgid ""
@@ -1281,11 +1297,11 @@ msgstr ""
 
 #: uninstalling.page:6
 msgid "How to remove Tor Browser from your system"
-msgstr ""
+msgstr "ÚÚ¯ÙÙÙ ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø±Ø§ Ø§Ø² Ø³ÛØ³ØªÙ Ø®ÙØ¯ ØØ°Ù 
Ú©ÙÛØ¯"
 
 #: uninstalling.page:10
 msgid

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

2017-05-18 Thread translation

commit 0b97469be5974299dc5f9726b9d7ba7d15bc3b7f
Author: Translation commit bot 
Date:   Thu May 18 19:15:16 2017 +

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

diff --git a/fa/fa.po b/fa/fa.po
index 65886df..426f187 100644
--- a/fa/fa.po
+++ b/fa/fa.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2017-05-18 18:34+\n"
+"PO-Revision-Date: 2017-05-18 19:14+\n"
 "Last-Translator: Amir Moezzi \n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -61,7 +61,7 @@ msgstr "Ø¯ÙÛÙ Ù Ø´Ø±Ø Ø¯ÙÛÙ Ø®Ø·Ø§"
 
 #: ../whisperBack/gui.py:116
 msgid "Desired result"
-msgstr ""
+msgstr "ÙØªÛØ¬Ù ÙØ·ÙÙØ¨"
 
 #: ../whisperBack/gui.py:152
 msgid "Unable to load a valid configuration."

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

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

2017-05-18 Thread translation

commit 85d997db50f6b08624d27bf0b5da7ac8abf22cae
Author: Translation commit bot 
Date:   Thu May 18 19:15:19 2017 +

Update translations for whisperback_completed
---
 fa/fa.po | 63 ---
 1 file changed, 40 insertions(+), 23 deletions(-)

diff --git a/fa/fa.po b/fa/fa.po
index 665142b..426f187 100644
--- a/fa/fa.po
+++ b/fa/fa.po
@@ -3,20 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Amir Moezzi , 2017
 # ardeshir, 2012
 # Mohammad Hossein , 2014
 # wtf , 2012
 # mohammad.s.n, 2013
 # Mohammad Hossein Mojtahedi , 2013
 # Mohammad Razavi , 2013
-# runasand , 2012
+# runasand , 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 19:54+0100\n"
-"PO-Revision-Date: 2016-03-21 16:28+\n"
-"Last-Translator: Mohammad Hossein \n"
+"POT-Creation-Date: 2017-03-20 12:09+\n"
+"PO-Revision-Date: 2017-05-18 19:14+\n"
+"Last-Translator: Amir Moezzi \n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,40 +47,56 @@ msgid ""
 "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
 msgstr "Ù¾Ø§Ø±Ø§ÙØªØ± ÙÙØ±Ø¯ ÙØ¸Ø±Ø %sØ Ø¯Ø± ÙÛÚ Ú©Ø¯Ø§Ù Ø§Ø² 
ÙØ§ÛÙ ÙØ§Û ØªÙØ¸ÛÙØ§Øª Ø²ÛØ± Ù¾ÛØ¯Ø§ 
ÙØ´Ø¯:\n/etc/whisperback/config.py\n~/.whisperback/config.py\n./config.py"
 
-#: ../whisperBack/gui.py:148
+#: ../whisperBack/gui.py:110
+msgid "Name of the affected software"
+msgstr "ÙØ§Ù ÙØ±Ù Ø§ÙØ²Ø§Ø± Ø§Ø«Ø± Ú¯Ø°Ø§Ø±"
+
+#: ../whisperBack/gui.py:112
+msgid "Exact steps to reproduce the error"
+msgstr "ÙØ¯Ù ÙØ§Û Ø¯ÙÛÙ Ø¨Ø±Ø§Û ØªØµØÛØ Ú©Ø±Ø¯Ù Ø®Ø·Ø§"
+
+#: ../whisperBack/gui.py:114
+msgid "Actual result and description of the error"
+msgstr "Ø¯ÙÛÙ Ù Ø´Ø±Ø Ø¯ÙÛÙ Ø®Ø·Ø§"
+
+#: ../whisperBack/gui.py:116
+msgid "Desired result"
+msgstr "ÙØªÛØ¬Ù ÙØ·ÙÙØ¨"
+
+#: ../whisperBack/gui.py:152
 msgid "Unable to load a valid configuration."
 msgstr "Ø§ÙÚ©Ø§Ù Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±Û ÛÚ© Ù¾ÛÚ©Ø±Ø¨ÙØ¯Û ÙØ¹ØªØ¨Ø± ÙØ¬ÙØ¯ 
ÙØ¯Ø§Ø±Ø¯."
 
-#: ../whisperBack/gui.py:214
+#: ../whisperBack/gui.py:218
 msgid "Sending mail..."
 msgstr "Ø¯Ø±ØØ§Ù Ø§Ø±Ø³Ø§Ù ÙØ§ÙÙ..."
 
-#: ../whisperBack/gui.py:215
+#: ../whisperBack/gui.py:219
 msgid "Sending mail"
 msgstr "Ø¯Ø±ØØ§Ù Ø§Ø±Ø³Ø§Ù ÙØ§ÙÙ"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:217
+#: ../whisperBack/gui.py:221
 msgid "This could take a while..."
 msgstr "Ø§ÛÙ Ø¹ÙÙÛØ§Øª ÙÙÚ©Ù Ø§Ø³Øª Ú©ÙÛ Ø¨Ø·ÙÙ Ø¨ÛØ§ÙØ¬Ø§Ù
Ø¯..."
 
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:236
 msgid "The contact email adress doesn't seem valid."
 msgstr "Ø¢Ø¯Ø±Ø³ Ø§ÛÙÛÙ ÙØ§Ø±Ø¯ Ø´Ø¯Ù Ø¨Ù ÙØ¸Ø± ØµØÛØ ÙÙ
ÛâØ±Ø³Ø¯."
 
-#: ../whisperBack/gui.py:249
+#: ../whisperBack/gui.py:253
 msgid "Unable to send the mail: SMTP error."
 msgstr "Ø§ÙÚ©Ø§Ù Ø§Ø±Ø³Ø§Ù ÙØ§ÙÙ ÙØ¬ÙØ¯ ÙØ¯Ø§Ø±Ø¯: Ø®Ø·Ø§Û SMTP."
 
-#: ../whisperBack/gui.py:251
+#: ../whisperBack/gui.py:255
 msgid "Unable to connect to the server."
 msgstr "Ø§ÙÚ©Ø§Ù Ø¨Ø±ÙØ±Ø§Ø±Û Ø§Ø±ØªØ¨Ø§Ø· Ø¨Ø§ Ø³Ø±ÙØ± ÙØ¬ÙØ¯ 
ÙØ¯Ø§Ø±Ø¯."
 
-#: ../whisperBack/gui.py:253
+#: ../whisperBack/gui.py:257
 msgid "Unable to create or to send the mail."
 msgstr "Ø§ÙÚ©Ø§Ù Ø§ÛØ¬Ø§Ø¯ Ù ÛØ§ Ø§Ø±Ø³Ø§Ù ÙØ§ÙÙ ÙØ¬ÙØ¯ ÙØ¯Ø§Ø±Ø¯."
 
-#: ../whisperBack/gui.py:256
+#: ../whisperBack/gui.py:260
 msgid ""
 "\n"
 "\n"
@@ -88,20 +105,20 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nÚ¯Ø²Ø§Ø±Ø´ Ø¨Ø§Ú¯\"Ø®Ø·Ø§ ÙØ±Ù Ø§ÙØ²Ø§Ø±\" ÙØ±Ø³ØªØ§Ø¯Ù 
ÙØ´Ø¯. Ø¨Ù ÙØ¸Ø± ÙÛØ±Ø³Ø¯ Ú©Ù Ø§ÛÙ Ø§Ø´Ú©Ø§Ù Ø§Ø² Ø´Ø¨Ú©Ù Ø¨Ø§Ø´Ø¯. 
ÙØ·ÙØ§ Ø³Ø¹Û Ú©ÙÛØ¯  Ø¯ÙØ¨Ø§Ø±Ù Ø¨Ù Ø´Ø¨Ú©Ù ÙØªØµÙ Ø´ÙÛØ¯ Ù 
Ø±ÙÛ Ú¯Ø²ÛÙÙ Ø§Ø±Ø³Ø§Ù Ú©ÙÛÚ© Ú©ÙÛØ¯.â\nâ\nØ§Ú¯Ø±ÙÙØ§Ø±Ø¯ 
Ø°Ú©Ø± Ø´Ø¯Ù Ø¯Ø± Ø¨Ø§ÙØ§ Ú©Ø§Ø± ÙÚ©Ø±Ø¯Ø Ø¨Ù Ø´ÙØ§ Ù¾ÛØ´ÙÙØ§Ø¯ 
Ø¯Ø§Ø¯Ù Ø®ÙØ§ÙØ¯ Ø´Ø¯ ØªØ§ Ú¯Ø²Ø§Ø±Ø´ Ø¨Ø§Ú¯ \"Ø®Ø·Ø§ ÙØ±Ù Ø§ÙØ²Ø§Ø±\" 
Ø±Ø§ Ø°Ø®ÛØ±Ù Ú©ÙÛØ¯."
 
-#: ../whisperBack/gui.py:269
+#: ../whisperBack/gui.py:273
 msgid "Your message has been sent."
 msgstr "Ù¾ÛØºØ§Ù Ø´ÙØ§ Ø§Ø±Ø³Ø§Ù Ø´Ø¯."
 
-#: ../whisperBack/gui.py:276
+#: ../whisperBack/gui.py:280
 msgid "An error occured during encryption."
 msgstr "Ø¯Ø± ÙÙÚ¯Ø§Ù Ø±ÙØ²ÙÚ¯Ø§Ø±Û Ø®Ø·Ø§ÛÛ Ø±Ø® Ø¯Ø§Ø¯Ù Ø§Ø³Øª."
 
-#: ../whisperBack/gui.py:296
+#: ../whisperBack/gui.py:300
 #, python-format
 msgid "Unable to save %s."
 msgstr "Ø§ÙÚ©Ø§Ù Ø°Ø®ÛØ±Ù Ø³Ø§Ø²Û Ø§Ø·ÙØ§Ø¹Ø§Øª ÙØ¬ÙØ¯ ÙØ¯Ø§Ø±Ø¯%s"
 
-#: ../whisperBack/gui.py:319
+#: ../whisperBack/gui.py:323
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@

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

2017-05-18 Thread translation

commit 31576df035c1d6a13827232917acaf44f476c128
Author: Translation commit bot 
Date:   Thu May 18 18:48:37 2017 +

Update translations for tor-browser-manual
---
 fa/fa.po | 25 +++--
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/fa/fa.po b/fa/fa.po
index 0c73453..4689d52 100644
--- a/fa/fa.po
+++ b/fa/fa.po
@@ -8,12 +8,13 @@
 # arashaalaei , 2016
 # zendegi , 2016
 # Goudarz Jafari , 2016
+# Amir Moezzi , 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Goudarz Jafari , 2016\n"
+"Last-Translator: Amir Moezzi , 2017\n"
 "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -190,7 +191,7 @@ msgstr ""
 
 #: circumvention.page:6
 msgid "What to do if the Tor network is blocked"
-msgstr ""
+msgstr "ÚÙ Ú©ÙÛÙ Ø§Ú¯Ø± Ø´Ø¨Ú©Ù ØªÙØ± ÙØ³Ø¯ÙØ¯ Ø´Ø¯Ø"
 
 #: circumvention.page:10
 msgid "Circumvention"
@@ -263,7 +264,7 @@ msgstr ""
 
 #: circumvention.page:60
 msgid "Which transport should I use?"
-msgstr ""
+msgstr "Ø¨Ø§ÛØ¯ Ø§Ø² Ú©Ø¯Ø§Ù ØªØ±ÙØ³Ù¾ÙØ±Øª Ø§Ø³ØªÙØ§Ø¯Ù Ú©ÙÙØ"
 
 #: circumvention.page:61
 msgid ""
@@ -366,25 +367,27 @@ msgstr ""
 
 #: downloading.page:84
 msgid "Satori"
-msgstr ""
+msgstr "Ø³Ø§ØªÙØ±Û"
 
 #: downloading.page:85
 msgid ""
 "Satori is an add-on for the Chrome or Chromium browsers that allows you to "
 "download several security and privacy programs from different sources."
 msgstr ""
+"Ø³Ø§ØªÙØ±Û ÛÚ© Ø§ÙØ²ÙØ¯ÙÛ Ø¨Ø±Ø§Û ÙØ±ÙØ±Ú¯Ø±ÙØ§Û Ú©Ø±ÙÙ ÛØ§ 
Ú©Ø±ÙÙÛÙÙ Ø§Ø³Øª Ú©Ù Ø¨Ù Ø´ÙØ§ Ø§ÛÙ Ø§Ø¬Ø§Ø²Ù Ø±Ø§ "
+"ÙÛ Ø¯ÙØ¯ Ú©Ù ÚÙØ¯ÛÙ Ø¨Ø±ÙØ§ÙÙ Ø§ÙÙÛØªÛ ÛØ§ Ø®ØµÙØµÛ Ø§Ø² 
Ø³ÙØ±Ø³ ÙØ§Û ÙØ®ØªÙÙ Ø±Ø§ Ø¯Ø§ÙÙÙØ¯ Ú©ÙÛØ¯"
 
 #: downloading.page:90
 msgid "To download Tor Browser using Satori:"
-msgstr ""
+msgstr "Ø¨Ø±Ø§Û Ø¯Ø§ÙÙÙØ¯ ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø§Ø² Ø³Ø§ØªÙØ±Û 
Ø§Ø³ØªÙØ§Ø¯Ù ÙÛ Ø´ÙØ¯ : "
 
 #: downloading.page:95
 msgid "Install Satori from the Chrome App Store."
-msgstr ""
+msgstr "Ø³Ø§ØªÙØ±Û Ø±Ø§ Ø§Ø² Ø§Ù¾ Ø§Ø³ØªÙØ± Ú©Ø±ÙÙ Ø¯Ø§ÙÙÙØ¯ Ú©ÙÛØ¯"
 
 #: downloading.page:100
 msgid "Select Satori from your browserâs Apps menu."
-msgstr ""
+msgstr "Ø³Ø§ØªÙØ±Û Ø±Ø§ Ø§Ø² ÙØ³ÙØª ÙÙÙÛ Ø¨Ø±ÙØ§ÙÙ ÙØ§Û Ù
Ø±ÙØ±Ú¯Ø±ÙØ§Û Ø®ÙØ¯ Ø§ÙØªØ®Ø§Ø¨ Ú©ÙÛØ¯"
 
 #: downloading.page:105
 msgid ""
@@ -1023,7 +1026,7 @@ msgstr ""
 
 #: security-slider.page:10
 msgid "Security Slider"
-msgstr ""
+msgstr "Ø§Ø³ÙØ§ÛØ¯Ø± Ø§ÙÙÛØªÛ"
 
 #: security-slider.page:11
 msgid ""
@@ -1036,7 +1039,7 @@ msgstr ""
 
 #: security-slider.page:21
 msgid "Accessing the Security Slider"
-msgstr ""
+msgstr "Ø¯Ø³ØªØ±Ø³Û Ø¨Ù Ø§Ø³ÙØ§ÛØ¯Ø± Ø§ÙÙÛØªÛ"
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
@@ -1399,10 +1402,12 @@ msgid ""
 "Wait for the update to download and install, then restart Tor Browser. You "
 "will now be running the latest version."
 msgstr ""
+"ØªØ§ Ù¾Ø§ÛØ§Ù Ø¯Ø§ÙÙÙØ¯ Ù ÙØµØ¨ Ø¨Ø±ÙØ²Ø±Ø³Ø§ÙÛ ØµØ¨Ø± Ú©ÙÛØ¯, 
Ø³Ù¾Ø³ ÙØ±ÙØ±Ú¯Ø± Ø±Ø§ Ø¨Ø¨ÙØ¯ÛØ¯ Ù Ø¯ÙØ¨Ø§Ø±Ù Ø¨Ø§Ø² "
+"Ú©ÙÛØ¯. ØØ§Ù Ø´ÙØ§ Ø¢Ø®Ø±ÛÙ ÙØ³Ø®Ù Ø±Ø§ Ø¯Ø§Ø±ÛØ¯"
 
 #: updating.page:58
 msgid "Updating Tor Browser manually"
-msgstr ""
+msgstr "Ø¯Ø± ØØ§Ù Ø¨Ø±ÙØ²Ø±Ø³Ø§ÙÛ ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø¨Ù ØµÙØ±Øª 
Ø¯Ø³ØªÛ"
 
 #: updating.page:61
 msgid ""

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

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

2017-05-18 Thread translation

commit 5dc5e12def612801481fee67ec5e8ec4b20a595f
Author: Translation commit bot 
Date:   Thu May 18 18:48:30 2017 +

Update translations for exoneratorproperties
---
 fa/exonerator.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fa/exonerator.properties b/fa/exonerator.properties
index 5d8b815..2a64cad 100644
--- a/fa/exonerator.properties
+++ b/fa/exonerator.properties
@@ -49,6 +49,6 @@ footer.aboutexonerator.heading=Ø¯Ø±Ø¨Ø§Ø±Ù ExoneraTor
 footer.aboutexonerator.body=The ExoneraTor service maintains a database of IP 
addresses that have been part of the Tor network. It answers the question 
whether there was a Tor relay running on a given IP address on a given 
date. ExoneraTor may store more than one IP address per relay if relays 
use a different IP address for exiting to the Internet than for registering in 
the Tor network, and it stores whether a relay permitted transit of Tor traffic 
to the open Internet at that time.
 footer.trademark.text="ØªÙØ±" Ù "ÙÙÚ¯ÙÛ Ù¾ÛØ§Ø²" %s ÙØ§Û Ù¾Ø±ÙÚÙ 
ØªÙØ± ÙØ³ØªÙØ¯.
 footer.trademark.link=Ø¹ÙØ§Ø¦Ù ØªØ¬Ø§Ø±Û Ø«Ø¨Øª Ø´Ø¯Ù
-footer.language.name=English
-footer.language.text=This page is also available in the following languages\:
+footer.language.name=Ø§ÙÚ¯ÙÛØ³Û
+footer.language.text=ÙÙÚÙÛÙ Ø§ÛÙ ØµÙØÙ Ø¯Ø± Ø§ÛÙ Ø²Ø¨Ø§Ù ÙØ§ 
ÙØ¹Ø§Ù Ø®ÙØ§ÙØ¯ Ø¨ÙØ¯ \:
 

___
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-05-18 Thread translation

commit 0ecd1911b72b3abdb51b3aed306d6cb343c26e91
Author: Translation commit bot 
Date:   Thu May 18 18:48:23 2017 +

Update translations for tails-greeter-2
---
 fa/fa.po | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/fa/fa.po b/fa/fa.po
index b763948..dfd7045 100644
--- a/fa/fa.po
+++ b/fa/fa.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 09:46+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: NoProfile , 2016\n"
+"Last-Translator: Amir Moezzi , 2017\n"
 "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -117,19 +117,19 @@ msgstr "Ø°Ø®ÛØ±Ù ØªÙØ¸ÛÙØ§Øª Ø²Ø¨Ø§Ù Ù ÙÙØ·ÙÙ"
 
 #: ../data/greeter.ui.h:25
 msgid "_Language"
-msgstr ""
+msgstr "_Ø²Ø¨Ø§Ù"
 
 #: ../data/greeter.ui.h:26
 msgid "_Keyboard Layout"
-msgstr ""
+msgstr "_Ø·Ø±Ø Ø¨ÙØ¯Û ØµÙØÙ Ú©ÙÛØ¯ "
 
 #: ../data/greeter.ui.h:27
 msgid "_Formats"
-msgstr ""
+msgstr "_ÙØ§ÙØ¨ ÙØ§"
 
 #: ../data/greeter.ui.h:28
 msgid "_Time Zone"
-msgstr ""
+msgstr "_Ø²ÙØ§Ù ÙÙØ·ÙÙ"
 
 #: ../data/greeter.ui.h:29
 msgid "Encrypted _Persistent Storage"
@@ -162,7 +162,7 @@ msgstr ""
 
 #: ../data/greeter.ui.h:36
 msgid "_Additional Settings"
-msgstr ""
+msgstr "_ØªÙØ¸ÛÙØ§Øª Ø§Ø¶Ø§ÙÛ"
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -185,11 +185,11 @@ msgstr ""
 
 #: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
-msgstr ""
+msgstr "ÙØ³ØªÙÛÙ Ø¨Ù Ø´Ø¨Ú©Ù ØªÙØ± ÙØµÙ Ø´ÙÛØ¯ (Ù¾ÛØ´ÙØ±Ø¶)"
 
 #: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
-msgstr ""
+msgstr "Ù¾ÛÚ©Ø± Ø¨ÙØ¯Û Ù¾Ù ØªÙØ±, ÙØ§ÛØ± ÙØ§Ù, ÛØ§ ØªÙØ¸ÛÙØ§Øª 
Ù¾Ø±ÙÚ©Ø³Û"
 
 #: ../data/greeter.ui.h:43
 msgid "Disable all networking"
@@ -203,7 +203,7 @@ msgstr ""
 
 #: ../data/greeter.ui.h:45
 msgid "_Administration Password"
-msgstr ""
+msgstr "_Ú¯Ø°Ø± ÙØ§ÚÙ ÙØ¯ÛØ±ÛØª"
 
 #: ../data/greeter.ui.h:46
 msgid "Off (default)"
@@ -219,7 +219,7 @@ msgstr "Ø±ÙØ´Ù (Ù¾ÛØ´ ÙØ±Ø¶)"
 
 #: ../data/greeter.ui.h:49
 msgid "_Network Connection"
-msgstr ""
+msgstr "_Ø§ØªØµØ§Ù Ø´Ø¨Ú©Ù"
 
 #: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:382
 msgid "Direct (default)"

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

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

2017-05-18 Thread translation

commit 3a1da19d9863c6f1a700b1201006af8590921ae9
Author: Translation commit bot 
Date:   Thu May 18 18:47:08 2017 +

Update translations for tor_animation
---
 fa.srt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fa.srt b/fa.srt
index f817721..11a8568 100644
--- a/fa.srt
+++ b/fa.srt
@@ -120,7 +120,7 @@
 
 31
 00:01:49,920 --> 00:01:51,920
-Ø¯ÛÚ¯Ù ØªØ§ Ø±ÙÛ ÛÙ ÚÛØ²Û Ú©ÙÛÚ© Ú©ÙÛØ¯
+ÙÚ¯Ø± Ø§ÛÙÚ©Ù Ø´ÙØ§ ÙØ§Ø±Ø¯ Ø´ÙÛØ¯ Ù Ø¨Ù Ø¢ÙÙØ§ Ø¨Ú¯ÙÛÛØ¯
 
 32
 00:01:54,200 --> 00:01:55,840

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

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

2017-05-18 Thread translation

commit c1a8eed112cb1b5f23eb95fd181c1060cc0fd0c6
Author: Translation commit bot 
Date:   Thu May 18 18:47:11 2017 +

Update translations for tor_animation_completed
---
 fa.srt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fa.srt b/fa.srt
index f817721..11a8568 100644
--- a/fa.srt
+++ b/fa.srt
@@ -120,7 +120,7 @@
 
 31
 00:01:49,920 --> 00:01:51,920
-Ø¯ÛÚ¯Ù ØªØ§ Ø±ÙÛ ÛÙ ÚÛØ²Û Ú©ÙÛÚ© Ú©ÙÛØ¯
+ÙÚ¯Ø± Ø§ÛÙÚ©Ù Ø´ÙØ§ ÙØ§Ø±Ø¯ Ø´ÙÛØ¯ Ù Ø¨Ù Ø¢ÙÙØ§ Ø¨Ú¯ÙÛÛØ¯
 
 32
 00:01:54,200 --> 00:01:55,840

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

[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2017-05-18 Thread translation

commit 3a4b53014bbeadaf26acbdc65b3b9827c2892c31
Author: Translation commit bot 
Date:   Thu May 18 18:46:32 2017 +

Update translations for abouttor-homepage_completed
---
 fa/aboutTor.dtd | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/fa/aboutTor.dtd b/fa/aboutTor.dtd
index c93b559..7ed77f8 100644
--- a/fa/aboutTor.dtd
+++ b/fa/aboutTor.dtd
@@ -19,10 +19,7 @@
 
 
 
-
-https://startpage.com/rth/search;>
-https://duckduckgo.com/html/;>
-https://search.disconnect.me/searchTerms/search?ses=Googlelocation_option=USsource=tor;>
+https://duckduckgo.com;>
 
 
 
@@ -32,6 +29,8 @@
 
 
 https://www.torproject.org/download/download.html.en#warning;>
+
+
 
 
 

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

[tor-commits] [translation/mat-gui_completed] Update translations for mat-gui_completed

2017-05-18 Thread translation

commit 1f39581e5e4e5f1b7ded5740fbfc9f84f0734c3b
Author: Translation commit bot 
Date:   Thu May 18 18:46:04 2017 +

Update translations for mat-gui_completed
---
 fa.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fa.po b/fa.po
index d576f24..20a8220 100644
--- a/fa.po
+++ b/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2017-05-18 18:15+\n"
+"PO-Revision-Date: 2017-05-18 18:17+\n"
 "Last-Translator: Amir Moezzi \n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@ msgstr "ÙØ§Ø´ÙØ§Ø®ØªÙ"
 
 #: mat-gui:325
 msgid "Not-supported"
-msgstr "ØºÛØ± ÙØ§Ø¨Ù ÙØ¨ÙÙ"
+msgstr "Ù¾Ø´ØªÛØ¨Ø§ÙÛ ÙØ´Ø¯Ù"
 
 #: mat-gui:339
 msgid "Harmless fileformat"
@@ -99,7 +99,7 @@ msgstr "ÙØ±ÙØª ÙØ§ÛÙ ÙØ§Û Ø¨Û Ø®Ø·Ø±"
 
 #: mat-gui:341
 msgid "Cant read file"
-msgstr "ÙÙÛ ØªÙØ§ÙÙ ÙØ§ÛÙ Ø±Ø§ Ø¨Ø®ÙØ§ÙÙ"
+msgstr "ÙØ§ÛÙ Ø®ÙØ§ÙØ¯Ù ÙÙÛ Ø´ÙØ¯"
 
 #: mat-gui:343
 msgid "Fileformat not supported"

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

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2017-05-18 Thread translation

commit d93bc0c4c134664799a39cd6f9525397d76509e1
Author: Translation commit bot 
Date:   Thu May 18 18:46:00 2017 +

Update translations for mat-gui
---
 fa.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fa.po b/fa.po
index d576f24..20a8220 100644
--- a/fa.po
+++ b/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2017-05-18 18:15+\n"
+"PO-Revision-Date: 2017-05-18 18:17+\n"
 "Last-Translator: Amir Moezzi \n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@ msgstr "ÙØ§Ø´ÙØ§Ø®ØªÙ"
 
 #: mat-gui:325
 msgid "Not-supported"
-msgstr "ØºÛØ± ÙØ§Ø¨Ù ÙØ¨ÙÙ"
+msgstr "Ù¾Ø´ØªÛØ¨Ø§ÙÛ ÙØ´Ø¯Ù"
 
 #: mat-gui:339
 msgid "Harmless fileformat"
@@ -99,7 +99,7 @@ msgstr "ÙØ±ÙØª ÙØ§ÛÙ ÙØ§Û Ø¨Û Ø®Ø·Ø±"
 
 #: mat-gui:341
 msgid "Cant read file"
-msgstr "ÙÙÛ ØªÙØ§ÙÙ ÙØ§ÛÙ Ø±Ø§ Ø¨Ø®ÙØ§ÙÙ"
+msgstr "ÙØ§ÛÙ Ø®ÙØ§ÙØ¯Ù ÙÙÛ Ø´ÙØ¯"
 
 #: mat-gui:343
 msgid "Fileformat not supported"

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

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

2017-05-18 Thread translation

commit 3bcff37942c03ab4fda6bd78e26e4fa62318bf76
Author: Translation commit bot 
Date:   Thu May 18 18:45:22 2017 +

Update translations for whisperback
---
 fa/fa.po | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/fa/fa.po b/fa/fa.po
index daae694..65886df 100644
--- a/fa/fa.po
+++ b/fa/fa.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Amir Moezzi , 2017
 # ardeshir, 2012
 # Mohammad Hossein , 2014
 # wtf , 2012
@@ -15,8 +16,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2017-03-21 08:24+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2017-05-18 18:34+\n"
+"Last-Translator: Amir Moezzi \n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,15 +49,15 @@ msgstr "Ù¾Ø§Ø±Ø§ÙØªØ± ÙÙØ±Ø¯ ÙØ¸Ø±Ø %sØ Ø¯Ø± ÙÛÚ 
Ú©Ø¯Ø§Ù Ø§Ø² ÙØ§ÛÙ
 
 #: ../whisperBack/gui.py:110
 msgid "Name of the affected software"
-msgstr ""
+msgstr "ÙØ§Ù ÙØ±Ù Ø§ÙØ²Ø§Ø± Ø§Ø«Ø± Ú¯Ø°Ø§Ø±"
 
 #: ../whisperBack/gui.py:112
 msgid "Exact steps to reproduce the error"
-msgstr ""
+msgstr "ÙØ¯Ù ÙØ§Û Ø¯ÙÛÙ Ø¨Ø±Ø§Û ØªØµØÛØ Ú©Ø±Ø¯Ù Ø®Ø·Ø§"
 
 #: ../whisperBack/gui.py:114
 msgid "Actual result and description of the error"
-msgstr ""
+msgstr "Ø¯ÙÛÙ Ù Ø´Ø±Ø Ø¯ÙÛÙ Ø®Ø·Ø§"
 
 #: ../whisperBack/gui.py:116
 msgid "Desired result"

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

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

2017-05-18 Thread translation

commit 87aec7887d6affe429d6c5b27f7669c54289c09a
Author: Translation commit bot 
Date:   Thu May 18 18:45:18 2017 +

Update translations for torcheck_completed
---
 fa/torcheck.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fa/torcheck.po b/fa/torcheck.po
index 0fb77a9..b900022 100644
--- a/fa/torcheck.po
+++ b/fa/torcheck.po
@@ -5,7 +5,7 @@
 # Ali, 2015
 # ardeshir, 2012
 # Mohammad Hossein , 2014
-# Gilberto, 2015
+# NoProfile, 2015
 # M. Heydar Elahi , 2014
 # mohammad.s.n, 2013
 # politicmaniac , 2014
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
+"PO-Revision-Date: 2017-05-18 18:27+\n"
 "Last-Translator: Ali\n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\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/torcheck] Update translations for torcheck

2017-05-18 Thread translation

commit c6d5b4d663b7e5b4069e9d06c223f6928be9173d
Author: Translation commit bot 
Date:   Thu May 18 18:45:15 2017 +

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

diff --git a/fa/torcheck.po b/fa/torcheck.po
index 0fb77a9..b900022 100644
--- a/fa/torcheck.po
+++ b/fa/torcheck.po
@@ -5,7 +5,7 @@
 # Ali, 2015
 # ardeshir, 2012
 # Mohammad Hossein , 2014
-# Gilberto, 2015
+# NoProfile, 2015
 # M. Heydar Elahi , 2014
 # mohammad.s.n, 2013
 # politicmaniac , 2014
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
+"PO-Revision-Date: 2017-05-18 18:27+\n"
 "Last-Translator: Ali\n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\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/bridgedb_completed] Update translations for bridgedb_completed

2017-05-18 Thread translation

commit 9669ac1c01475ce413b27f5ce85e937cf72f4f93
Author: Translation commit bot 
Date:   Thu May 18 18:45:11 2017 +

Update translations for bridgedb_completed
---
 fa/LC_MESSAGES/bridgedb.po | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po
index c188162..3b0 100644
--- a/fa/LC_MESSAGES/bridgedb.po
+++ b/fa/LC_MESSAGES/bridgedb.po
@@ -4,10 +4,11 @@
 # 
 # Translators:
 # arashaalaei , 2011
-# signal89 , 2014
+# signal89, 2014
+# Amir Moezzi , 2017
 # ardeshir, 2013
 # Ehsan Ab , 2015
-# Gilberto, 2014-2015
+# NoProfile, 2014-2015
 # johnholzer , 2014
 # Mohammad Hossein , 2014
 # perspolis , 2011
@@ -17,8 +18,8 @@ msgstr ""
 "Project-Id-Version: The 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: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: Ehsan Ab \n"
+"PO-Revision-Date: 2017-05-18 18:30+\n"
+"Last-Translator: Amir Moezzi \n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -195,7 +196,7 @@ msgstr "Ø¨Ù BridgeDB Ø®ÙØ´ Ø¢ÙØ¯ÛØ¯!"
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
 #: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "Ø§ÙÙØ§Ø¹ ÙÙÚ©Ù Ø§Ø² TYPE ÙØ§Û Ø§ÙØªÙØ§Ù:"
+msgstr "Ø¯Ø± ØØ§Ù ØØ§Ø¶Ø± ÙØ¯Ù ÙØ§Û ØÙÙ Ù ÙÙÙ Ù¾Ø´ØªÛØ¨Ø§ÙÛ 
Ø´Ø¯Ù ÙØ³ØªÙØ¯ : "
 
 #: bridgedb/strings.py:56
 #, python-format

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

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

2017-05-18 Thread translation

commit 0131acfddecb05dc6c11f239e3df7f2f00e54e3e
Author: Translation commit bot 
Date:   Thu May 18 18:45:04 2017 +

Update translations for bridgedb
---
 fa/LC_MESSAGES/bridgedb.po | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po
index c188162..3b0 100644
--- a/fa/LC_MESSAGES/bridgedb.po
+++ b/fa/LC_MESSAGES/bridgedb.po
@@ -4,10 +4,11 @@
 # 
 # Translators:
 # arashaalaei , 2011
-# signal89 , 2014
+# signal89, 2014
+# Amir Moezzi , 2017
 # ardeshir, 2013
 # Ehsan Ab , 2015
-# Gilberto, 2014-2015
+# NoProfile, 2014-2015
 # johnholzer , 2014
 # Mohammad Hossein , 2014
 # perspolis , 2011
@@ -17,8 +18,8 @@ msgstr ""
 "Project-Id-Version: The 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: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: Ehsan Ab \n"
+"PO-Revision-Date: 2017-05-18 18:30+\n"
+"Last-Translator: Amir Moezzi \n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -195,7 +196,7 @@ msgstr "Ø¨Ù BridgeDB Ø®ÙØ´ Ø¢ÙØ¯ÛØ¯!"
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
 #: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "Ø§ÙÙØ§Ø¹ ÙÙÚ©Ù Ø§Ø² TYPE ÙØ§Û Ø§ÙØªÙØ§Ù:"
+msgstr "Ø¯Ø± ØØ§Ù ØØ§Ø¶Ø± ÙØ¯Ù ÙØ§Û ØÙÙ Ù ÙÙÙ Ù¾Ø´ØªÛØ¨Ø§ÙÛ 
Ø´Ø¯Ù ÙØ³ØªÙØ¯ : "
 
 #: bridgedb/strings.py:56
 #, python-format

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

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2017-05-18 Thread translation

commit db59c79f2ec9df5c655f2efa165a168c42d9c86a
Author: Translation commit bot 
Date:   Thu May 18 18:15:53 2017 +

Update translations for mat-gui
---
 fa.po | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/fa.po b/fa.po
index dd9a1b7..d576f24 100644
--- a/fa.po
+++ b/fa.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # signal89, 2016
+# Amir Moezzi , 2017
 # Mohammad Hossein , 2014
 # NoProfile, 2016
 # zendegi , 2013
@@ -13,8 +14,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2016-06-08 10:07+\n"
-"Last-Translator: signal89\n"
+"PO-Revision-Date: 2017-05-18 18:15+\n"
+"Last-Translator: Amir Moezzi \n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +29,7 @@ msgstr "Ø¢ÙØ§Ø¯Ù"
 
 #: mat-gui:136
 msgid "Choose files"
-msgstr "ÙØ§ÙÙâÙØ§ Ø§ÙØªØ®Ø§Ø¨ Ú©ÙÛØ¯"
+msgstr "ÙØ§ÛÙ Ø±Ø§ Ø§ÙØªØ®Ø§Ø¨ Ú©ÙÛØ¯"
 
 #: mat-gui:144
 msgid "Supported files"
@@ -36,16 +37,16 @@ msgstr "ÙØ§ÛÙ ÙØ§Û ÙØ§Ø¨Ù Ù¾Ø´ØªÛØ¨Ø§ÙÛ."
 
 #: mat-gui:151
 msgid "All files"
-msgstr "ÙÙÙÙÙ ÙØ§ÛÙâÙØ§"
+msgstr "ÙÙÙ ÙØ§ÛÙ ÙØ§"
 
 #: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443
 #: data/mat.glade:200
 msgid "Clean"
-msgstr "Ù¾Ø§Ú©âÚ©Ø±Ø¯Ù"
+msgstr "Ù¾Ø§Ú©â Ú©Ø±Ø¯Ù"
 
 #: mat-gui:168
 msgid "No metadata found"
-msgstr "ÙÛÚ Â«Ø§Ø¨Ø± Ø¯Ø§Ø¯Ù Ø§ÛÂ» ÛØ§ÙØª ÙØ´Ø¯"
+msgstr "ÙÛÚ Â«ÙØ±Ø§ Ø¯Ø§Ø¯Ù Ø§ÛÂ» ÛØ§ÙØª ÙØ´Ø¯"
 
 #: mat-gui:170 mat-gui:419
 msgid "Dirty"
@@ -54,11 +55,11 @@ msgstr "Ú©Ø«ÛÙ"
 #: mat-gui:176
 #, python-format
 msgid "%s's metadata"
-msgstr "Ø§Ø¨Ø± Ø¯Ø§Ø¯Ù ÙØ§Û %s"
+msgstr "ÙØ±Ø§Ø¯Ø§Ø¯Ù %s"
 
 #: mat-gui:187
 msgid "Trash your meta, keep your data"
-msgstr "Ø§Ø¨Ø± Ø¯Ø§Ø¯Ù ÙØ§ Ø±Ø§ Ø¯ÙØ± Ø¨Ø±ÛØ²Ø Ø¯Ø§Ø¯Ù ÙØ§ Ø±Ø§ ÙÚ¯Ù 
Ø¯Ø§Ø±"
+msgstr "ÙØ±Ø§Ø¯Ø§Ø¯Ù ÙØ§Ø±Ø§ Ù¾Ø§Ú© Ú©ÙØ Ø¯Ø§Ø¯Ù ÙØ§ÛØª Ø±Ø§ ÙÚ¯Ù 
Ø¯Ø§Ø±"
 
 #: mat-gui:192
 msgid "Website"
@@ -161,7 +162,7 @@ msgstr "ØØ§Ù"
 
 #: data/mat.glade:294 data/mat.glade:467
 msgid "Metadata"
-msgstr "Ø§Ø¨Ø±Ø¯Ø§Ø¯Ù"
+msgstr "ÙØ±Ø§Ø¯Ø§Ø¯Ù"
 
 #: data/mat.glade:354
 msgid "Name"
@@ -189,4 +190,4 @@ msgstr "Ø¨Ø§ÙÛ ÙØ§ÙØ¯Ù"
 
 #: data/mat.glade:518
 msgid "Fileformat"
-msgstr "ÙØ±ÙØª ÙØ§ÛÙ"
+msgstr "ÙØ§ÙØ¨ ÙØ§ÛÙ"

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

[tor-commits] [translation/mat-gui_completed] Update translations for mat-gui_completed

2017-05-18 Thread translation

commit 2680720b2f4fd0fdca425f9205c1d88bb092348c
Author: Translation commit bot 
Date:   Thu May 18 18:15:57 2017 +

Update translations for mat-gui_completed
---
 fa.po | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/fa.po b/fa.po
index dd9a1b7..d576f24 100644
--- a/fa.po
+++ b/fa.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # signal89, 2016
+# Amir Moezzi , 2017
 # Mohammad Hossein , 2014
 # NoProfile, 2016
 # zendegi , 2013
@@ -13,8 +14,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2016-06-08 10:07+\n"
-"Last-Translator: signal89\n"
+"PO-Revision-Date: 2017-05-18 18:15+\n"
+"Last-Translator: Amir Moezzi \n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +29,7 @@ msgstr "Ø¢ÙØ§Ø¯Ù"
 
 #: mat-gui:136
 msgid "Choose files"
-msgstr "ÙØ§ÙÙâÙØ§ Ø§ÙØªØ®Ø§Ø¨ Ú©ÙÛØ¯"
+msgstr "ÙØ§ÛÙ Ø±Ø§ Ø§ÙØªØ®Ø§Ø¨ Ú©ÙÛØ¯"
 
 #: mat-gui:144
 msgid "Supported files"
@@ -36,16 +37,16 @@ msgstr "ÙØ§ÛÙ ÙØ§Û ÙØ§Ø¨Ù Ù¾Ø´ØªÛØ¨Ø§ÙÛ."
 
 #: mat-gui:151
 msgid "All files"
-msgstr "ÙÙÙÙÙ ÙØ§ÛÙâÙØ§"
+msgstr "ÙÙÙ ÙØ§ÛÙ ÙØ§"
 
 #: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443
 #: data/mat.glade:200
 msgid "Clean"
-msgstr "Ù¾Ø§Ú©âÚ©Ø±Ø¯Ù"
+msgstr "Ù¾Ø§Ú©â Ú©Ø±Ø¯Ù"
 
 #: mat-gui:168
 msgid "No metadata found"
-msgstr "ÙÛÚ Â«Ø§Ø¨Ø± Ø¯Ø§Ø¯Ù Ø§ÛÂ» ÛØ§ÙØª ÙØ´Ø¯"
+msgstr "ÙÛÚ Â«ÙØ±Ø§ Ø¯Ø§Ø¯Ù Ø§ÛÂ» ÛØ§ÙØª ÙØ´Ø¯"
 
 #: mat-gui:170 mat-gui:419
 msgid "Dirty"
@@ -54,11 +55,11 @@ msgstr "Ú©Ø«ÛÙ"
 #: mat-gui:176
 #, python-format
 msgid "%s's metadata"
-msgstr "Ø§Ø¨Ø± Ø¯Ø§Ø¯Ù ÙØ§Û %s"
+msgstr "ÙØ±Ø§Ø¯Ø§Ø¯Ù %s"
 
 #: mat-gui:187
 msgid "Trash your meta, keep your data"
-msgstr "Ø§Ø¨Ø± Ø¯Ø§Ø¯Ù ÙØ§ Ø±Ø§ Ø¯ÙØ± Ø¨Ø±ÛØ²Ø Ø¯Ø§Ø¯Ù ÙØ§ Ø±Ø§ ÙÚ¯Ù 
Ø¯Ø§Ø±"
+msgstr "ÙØ±Ø§Ø¯Ø§Ø¯Ù ÙØ§Ø±Ø§ Ù¾Ø§Ú© Ú©ÙØ Ø¯Ø§Ø¯Ù ÙØ§ÛØª Ø±Ø§ ÙÚ¯Ù 
Ø¯Ø§Ø±"
 
 #: mat-gui:192
 msgid "Website"
@@ -161,7 +162,7 @@ msgstr "ØØ§Ù"
 
 #: data/mat.glade:294 data/mat.glade:467
 msgid "Metadata"
-msgstr "Ø§Ø¨Ø±Ø¯Ø§Ø¯Ù"
+msgstr "ÙØ±Ø§Ø¯Ø§Ø¯Ù"
 
 #: data/mat.glade:354
 msgid "Name"
@@ -189,4 +190,4 @@ msgstr "Ø¨Ø§ÙÛ ÙØ§ÙØ¯Ù"
 
 #: data/mat.glade:518
 msgid "Fileformat"
-msgstr "ÙØ±ÙØª ÙØ§ÛÙ"
+msgstr "ÙØ§ÙØ¨ ÙØ§ÛÙ"

___
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.0] bump to 0.3.0.7-dev

2017-05-18 Thread nickm

commit d1340bd5ac905e650dfdad53aeba0361231def16
Author: Nick Mathewson 
Date:   Thu May 18 12:28:28 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 4c82638..8627335 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.0.7])
+AC_INIT([tor],[0.3.0.7-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 1ea622f..96c242b 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.3.0.7"
+!define VERSION "0.3.0.7-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 120fa21..49a4a45 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.0.7"
+#define VERSION "0.3.0.7-dev"
 
 
 

___
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.0] Merge branch 'maint-0.3.0' into release-0.3.0

2017-05-18 Thread nickm

commit 647fa4bdf4b499fbe2bb8d2f8ce127ca9134481b
Merge: bd62f78 d1340bd
Author: Nick Mathewson 
Date:   Thu May 18 12:28:34 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

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

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

[tor-commits] [tor/master] bump to 0.3.0.7-dev

2017-05-18 Thread nickm

commit d1340bd5ac905e650dfdad53aeba0361231def16
Author: Nick Mathewson 
Date:   Thu May 18 12:28:28 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 4c82638..8627335 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.0.7])
+AC_INIT([tor],[0.3.0.7-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 1ea622f..96c242b 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.3.0.7"
+!define VERSION "0.3.0.7-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 120fa21..49a4a45 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.0.7"
+#define VERSION "0.3.0.7-dev"
 
 
 



___
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.0'

2017-05-18 Thread nickm

commit e507751b9beb4ddabdda2d612387ab9edd58dac1
Merge: b214c2c d1340bd
Author: Nick Mathewson 
Date:   Thu May 18 12:28:48 2017 -0400

Merge branch 'maint-0.3.0'

"ours" 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/release-0.3.0] bump to 0.3.0.7-dev

2017-05-18 Thread nickm

commit d1340bd5ac905e650dfdad53aeba0361231def16
Author: Nick Mathewson 
Date:   Thu May 18 12:28:28 2017 -0400

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

diff --git a/configure.ac b/configure.ac
index 4c82638..8627335 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.0.7])
+AC_INIT([tor],[0.3.0.7-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 1ea622f..96c242b 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.3.0.7"
+!define VERSION "0.3.0.7-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 120fa21..49a4a45 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.0.7"
+#define VERSION "0.3.0.7-dev"
 
 
 



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

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

2017-05-18 Thread translation

commit f27c0edc5d48be350dfe096c1813be7cb5e4dd47
Author: Translation commit bot 
Date:   Thu May 18 16:16:43 2017 +

Update translations for tails-iuk
---
 th.po | 81 ++-
 1 file changed, 41 insertions(+), 40 deletions(-)

diff --git a/th.po b/th.po
index 9aef489..39e4392 100644
--- a/th.po
+++ b/th.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # kanesayan gwangsai , 2016
+# Soravis Prakkamakul , 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2016-05-25 16:55+0200\n"
-"PO-Revision-Date: 2016-12-31 06:29+\n"
-"Last-Translator: kanesayan gwangsai \n"
+"POT-Creation-Date: 2017-04-18 12:13+0200\n"
+"PO-Revision-Date: 2017-05-18 16:05+\n"
+"Last-Translator: Soravis Prakkamakul \n"
 "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,11 +24,11 @@ msgstr ""
 msgid ""
 "For debugging information, execute the following command: sudo tails-"
 "debugging-info"
-msgstr ""
+msgstr 
"à¸ªà¸³à¸«à¸£à¸±à¸à¸à¹à¸à¸¡à¸¹à¸¥à¹à¸à¸·à¹à¸à¸à¸²à¸£à¸à¸µà¸à¸±à¸ 
à¹à¸à¹à¸à¸³à¸ªà¸±à¹à¸: sudo tails-debugging-info"
 
 #: ../lib/Tails/IUK/Frontend.pm:217
 msgid "Error while checking for upgrades"
-msgstr ""
+msgstr 
"à¹à¸à¸´à¸à¸à¹à¸à¸à¸´à¸à¸à¸¥à¸²à¸à¸à¸à¸°à¸à¸£à¸§à¸à¸«à¸²à¸à¸²à¸£à¸à¸±à¸à¹à¸à¸£à¸"
 
 #: ../lib/Tails/IUK/Frontend.pm:220
 msgid ""
@@ -36,32 +37,32 @@ msgid ""
 "Check your network connection, and restart Tails to try upgrading again.\n"
 "\n"
 "If the problem persists, go to 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
-msgstr ""
+msgstr 
"à¹à¸¡à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¸à¸£à¸§à¸à¸ªà¸à¸à¹à¸à¹à¸§à¹à¸²à¸¡à¸µà¸à¸²à¸£à¸à¸±à¸à¹à¸à¸£à¸à¹à¸«à¸¡à¹à¸à¸à¹à¸§à¹à¸à¹à¸à¸à¹à¸à¸à¸à¹à¸£à¸²à¸«à¸£à¸·à¸à¹à¸¡à¹\n\nà¸à¸£à¸§à¸à¸ªà¸à¸à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸à¹à¸à¸£à¸·à¸à¸à¹à¸²à¸¢à¸à¸à¸à¸à¸¸à¸
 à¹à¸¥à¹à¸§à¹à¸£à¸´à¹à¸¡ Tails 
à¹à¸«à¸¡à¹à¸à¸µà¸à¸à¸£à¸±à¹à¸à¹à¸à¸·à¹à¸à¸¥à¸à¸à¸à¸±à¸à¹à¸à¸£à¸\n\nà¸à¹à¸²à¸«à¸²à¸à¸¢à¸±à¸à¸à¸à¸à¸±à¸à¸«à¸²à¹à¸«à¹à¹à¸à¸¢à¸±à¸\nfile:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 
 #: ../lib/Tails/IUK/Frontend.pm:235
 msgid "no automatic upgrade is available from our website for this version"
-msgstr ""
+msgstr 
"à¹à¸¡à¹à¸à¸à¸à¸²à¸£à¸à¸±à¸à¹à¸à¸£à¸à¸à¸±à¸à¹à¸à¸¡à¸±à¸à¸´à¸à¸²à¸à¹à¸§à¹à¸à¹à¸à¸à¹à¸à¸à¸à¹à¸£à¸²à¸ªà¸³à¸«à¸£à¸±à¸à¹à¸§à¸à¸£à¹à¸à¸±à¹à¸à¸à¸µà¹"
 
 #: ../lib/Tails/IUK/Frontend.pm:241
 msgid "your device was not created using Tails Installer"
-msgstr ""
+msgstr 
"à¸à¸¸à¸à¸à¸£à¸à¹à¸à¸à¸à¸à¸¸à¸à¹à¸¡à¹à¹à¸à¹à¸à¸¹à¸à¸ªà¸£à¹à¸²à¸à¹à¸à¸¢à¸à¸±à¸§à¸à¸´à¸à¸à¸±à¹à¸
 Tails"
 
 #: ../lib/Tails/IUK/Frontend.pm:246
 msgid "Tails was started from a DVD or a read-only device"
-msgstr ""
+msgstr "Tails à¸à¸¹à¸à¸à¸¹à¸à¸à¸¶à¹à¸à¸à¸²à¸à¸à¸µà¸§à¸µà¸à¸µ 
à¸«à¸£à¸·à¸à¸à¸¸à¸à¸à¸£à¸à¹ read-only"
 
 #: ../lib/Tails/IUK/Frontend.pm:251
 msgid "there is not enough free space on the Tails system partition"
-msgstr ""
+msgstr "à¸¡à¸µà¸à¸·à¹à¸à¸à¸µà¹à¸§à¹à¸²à¸à¸à¸ Tails system partition 
à¹à¸¡à¹à¹à¸à¸µà¸¢à¸à¸à¸"
 
 #: ../lib/Tails/IUK/Frontend.pm:256
 msgid "not enough memory is available on this system"
-msgstr ""
+msgstr 
"à¸«à¸à¹à¸§à¸¢à¸à¸§à¸²à¸¡à¸à¸³à¸à¸à¸£à¸°à¸à¸à¸à¸µà¹à¹à¸¡à¹à¹à¸à¸µà¸¢à¸à¸à¸"
 
 #: ../lib/Tails/IUK/Frontend.pm:262
 #, perl-brace-format
 msgid "No explanation available for reason '%{reason}s'."
-msgstr ""
+msgstr 
"à¹à¸¡à¹à¸¡à¸µà¸à¸³à¸à¸à¸´à¸à¸²à¸¢à¸ªà¸³à¸«à¸£à¸±à¸à¹à¸«à¸à¸¸à¸à¸¥: 
'%{reason}s'"
 
 #: ../lib/Tails/IUK/Frontend.pm:282
 msgid "The system is up-to-date"
@@ -69,31 +70,31 @@ msgstr 
"à¸£à¸°à¸à¸à¹à¸à¹à¸à¸£à¸¸à¹à¸à¸à¸±à¸à¸à¸¸à¸à¸±à¸"
 
 #: ../lib/Tails/IUK/Frontend.pm:287
 msgid "This version of Tails is outdated, and may have security issues."
-msgstr ""
+msgstr "Tails 
à¹à¸§à¸à¸£à¹à¸à¸±à¹à¸à¸à¸µà¹à¹à¸à¹à¸²à¹à¸à¸´à¸à¹à¸ 
à¹à¸¥à¸°à¸à¸²à¸à¸¡à¸µà¸à¸£à¸°à¹à¸à¹à¸à¸à¸±à¸à¸«à¸²à¹à¸à¸µà¹à¸¢à¸§à¸à¸±à¸à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸
 à¸±à¸¢"
 
 #: ../lib/Tails/IUK/Frontend.pm:319
 #, perl-brace-format
 msgid ""
 "The available incremental upgrade requires %{space_needed}s of free space on"
 " Tails system partition,  but only %{free_space}s is available."
-msgstr ""
+msgstr "à¸à¸²à¸£à¸à¸±à¸à¹à¸à¸£à¸à¹à¸à¸ incremental 
à¸à¸µà¹à¸à¹à¸à¸à¸à¸²à¸£à¸à¸·à¹à¸à¸à¸µà¹à¸§à¹à¸²à¸ %{space_needed} 
à¸à¸ Tails system partition 
à¹à¸à¹à¸à¸à¸°à¸à¸µà¹à¸¡à¸µà¸à¸·à¹à¸à¸à¸µà¹à¸§à¹à¸²à¸à¹à¸à¸µà¸¢à¸
 %{free_space}"
 
 #: ../lib/Tails/IUK/Frontend.pm:335
 #,

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

2017-05-18 Thread translation

commit 6880c1008451c2acc40eb13e413cacd91d6b9b7c
Author: Translation commit bot 
Date:   Thu May 18 16:16:46 2017 +

Update translations for tails-iuk_completed
---
 th.po | 249 ++
 1 file changed, 249 insertions(+)

diff --git a/th.po b/th.po
new file mode 100644
index 000..39e4392
--- /dev/null
+++ b/th.po
@@ -0,0 +1,249 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Tails developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# kanesayan gwangsai , 2016
+# Soravis Prakkamakul , 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: Tails developers \n"
+"POT-Creation-Date: 2017-04-18 12:13+0200\n"
+"PO-Revision-Date: 2017-05-18 16:05+\n"
+"Last-Translator: Soravis Prakkamakul \n"
+"Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../lib/Tails/IUK/Frontend.pm:148 ../lib/Tails/IUK/Frontend.pm:524
+#: ../lib/Tails/IUK/Frontend.pm:697
+msgid ""
+"For debugging information, execute the following command: sudo tails-"
+"debugging-info"
+msgstr 
"à¸ªà¸³à¸«à¸£à¸±à¸à¸à¹à¸à¸¡à¸¹à¸¥à¹à¸à¸·à¹à¸à¸à¸²à¸£à¸à¸µà¸à¸±à¸ 
à¹à¸à¹à¸à¸³à¸ªà¸±à¹à¸: sudo tails-debugging-info"
+
+#: ../lib/Tails/IUK/Frontend.pm:217
+msgid "Error while checking for upgrades"
+msgstr 
"à¹à¸à¸´à¸à¸à¹à¸à¸à¸´à¸à¸à¸¥à¸²à¸à¸à¸à¸°à¸à¸£à¸§à¸à¸«à¸²à¸à¸²à¸£à¸à¸±à¸à¹à¸à¸£à¸"
+
+#: ../lib/Tails/IUK/Frontend.pm:220
+msgid ""
+"Could not determine whether an upgrade is available from our 
website.\n"
+"\n"
+"Check your network connection, and restart Tails to try upgrading again.\n"
+"\n"
+"If the problem persists, go to 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
+msgstr 
"à¹à¸¡à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¸à¸£à¸§à¸à¸ªà¸à¸à¹à¸à¹à¸§à¹à¸²à¸¡à¸µà¸à¸²à¸£à¸à¸±à¸à¹à¸à¸£à¸à¹à¸«à¸¡à¹à¸à¸à¹à¸§à¹à¸à¹à¸à¸à¹à¸à¸à¸à¹à¸£à¸²à¸«à¸£à¸·à¸à¹à¸¡à¹\n\nà¸à¸£à¸§à¸à¸ªà¸à¸à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸à¹à¸à¸£à¸·à¸à¸à¹à¸²à¸¢à¸à¸à¸à¸à¸¸à¸
 à¹à¸¥à¹à¸§à¹à¸£à¸´à¹à¸¡ Tails 
à¹à¸«à¸¡à¹à¸à¸µà¸à¸à¸£à¸±à¹à¸à¹à¸à¸·à¹à¸à¸¥à¸à¸à¸à¸±à¸à¹à¸à¸£à¸\n\nà¸à¹à¸²à¸«à¸²à¸à¸¢à¸±à¸à¸à¸à¸à¸±à¸à¸«à¸²à¹à¸«à¹à¹à¸à¸¢à¸±à¸\nfile:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
+
+#: ../lib/Tails/IUK/Frontend.pm:235
+msgid "no automatic upgrade is available from our website for this version"
+msgstr 
"à¹à¸¡à¹à¸à¸à¸à¸²à¸£à¸à¸±à¸à¹à¸à¸£à¸à¸à¸±à¸à¹à¸à¸¡à¸±à¸à¸´à¸à¸²à¸à¹à¸§à¹à¸à¹à¸à¸à¹à¸à¸à¸à¹à¸£à¸²à¸ªà¸³à¸«à¸£à¸±à¸à¹à¸§à¸à¸£à¹à¸à¸±à¹à¸à¸à¸µà¹"
+
+#: ../lib/Tails/IUK/Frontend.pm:241
+msgid "your device was not created using Tails Installer"
+msgstr 
"à¸à¸¸à¸à¸à¸£à¸à¹à¸à¸à¸à¸à¸¸à¸à¹à¸¡à¹à¹à¸à¹à¸à¸¹à¸à¸ªà¸£à¹à¸²à¸à¹à¸à¸¢à¸à¸±à¸§à¸à¸´à¸à¸à¸±à¹à¸
 Tails"
+
+#: ../lib/Tails/IUK/Frontend.pm:246
+msgid "Tails was started from a DVD or a read-only device"
+msgstr "Tails à¸à¸¹à¸à¸à¸¹à¸à¸à¸¶à¹à¸à¸à¸²à¸à¸à¸µà¸§à¸µà¸à¸µ 
à¸«à¸£à¸·à¸à¸à¸¸à¸à¸à¸£à¸à¹ read-only"
+
+#: ../lib/Tails/IUK/Frontend.pm:251
+msgid "there is not enough free space on the Tails system partition"
+msgstr "à¸¡à¸µà¸à¸·à¹à¸à¸à¸µà¹à¸§à¹à¸²à¸à¸à¸ Tails system partition 
à¹à¸¡à¹à¹à¸à¸µà¸¢à¸à¸à¸"
+
+#: ../lib/Tails/IUK/Frontend.pm:256
+msgid "not enough memory is available on this system"
+msgstr 
"à¸«à¸à¹à¸§à¸¢à¸à¸§à¸²à¸¡à¸à¸³à¸à¸à¸£à¸°à¸à¸à¸à¸µà¹à¹à¸¡à¹à¹à¸à¸µà¸¢à¸à¸à¸"
+
+#: ../lib/Tails/IUK/Frontend.pm:262
+#, perl-brace-format
+msgid "No explanation available for reason '%{reason}s'."
+msgstr 
"à¹à¸¡à¹à¸¡à¸µà¸à¸³à¸à¸à¸´à¸à¸²à¸¢à¸ªà¸³à¸«à¸£à¸±à¸à¹à¸«à¸à¸¸à¸à¸¥: 
'%{reason}s'"
+
+#: ../lib/Tails/IUK/Frontend.pm:282
+msgid "The system is up-to-date"
+msgstr "à¸£à¸°à¸à¸à¹à¸à¹à¸à¸£à¸¸à¹à¸à¸à¸±à¸à¸à¸¸à¸à¸±à¸"
+
+#: ../lib/Tails/IUK/Frontend.pm:287
+msgid "This version of Tails is outdated, and may have security issues."
+msgstr "Tails 
à¹à¸§à¸à¸£à¹à¸à¸±à¹à¸à¸à¸µà¹à¹à¸à¹à¸²à¹à¸à¸´à¸à¹à¸ 
à¹à¸¥à¸°à¸à¸²à¸à¸¡à¸µà¸à¸£à¸°à¹à¸à¹à¸à¸à¸±à¸à¸«à¸²à¹à¸à¸µà¹à¸¢à¸§à¸à¸±à¸à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸
 à¸±à¸¢"
+
+#: ../lib/Tails/IUK/Frontend.pm:319
+#, perl-brace-format
+msgid ""
+"The available incremental upgrade requires %{space_needed}s of free space on"
+" Tails system partition,  but only %{free_space}s is available."
+msgstr "à¸à¸²à¸£à¸à¸±à¸à¹à¸à¸£à¸à¹à¸à¸ incremental 
à¸à¸µà¹à¸à¹à¸à¸à¸à¸²à¸£à¸à¸·à¹à¸à¸à¸µà¹à¸§à¹à¸²à¸ %{space_needed} 
à¸à¸ Tails system partition

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2017-05-18 Thread translation

commit 6a681deccd3b93ca22ac52119950b49d1b5c5092
Author: Translation commit bot 
Date:   Thu May 18 16:16:20 2017 +

Update translations for abouttor-homepage
---
 th/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/th/aboutTor.dtd b/th/aboutTor.dtd
index b443454..25825f3 100644
--- a/th/aboutTor.dtd
+++ b/th/aboutTor.dtd
@@ -30,7 +30,7 @@
 
 https://www.torproject.org/download/download.html.en#warning;>
 
-
+
 
 
 

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

[tor-commits] [torspec/master] Mark proposals 151 and 161 closed.

2017-05-18 Thread nickm

commit acbc18a30f962462e16413a5d639856ba5cb13bb
Author: Nick Mathewson 
Date:   Thu May 18 12:09:11 2017 -0400

Mark proposals 151 and 161 closed.

Mike informs me that prop151 got merged into path-spec and 161 got
split into dir-spec and a spec file in the bwauth code.
---
 proposals/000-index.txt   | 8 
 proposals/151-path-selection-improvements.txt | 2 +-
 proposals/161-computing-bandwidth-adjustments.txt | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index 62d6414..5dc4395 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -71,7 +71,7 @@ Proposals by number:
 148  Stream end reasons from the client side should be uniform [CLOSED]
 149  Using data from NETINFO cells [SUPERSEDED]
 150  Exclude Exit Nodes from a circuit [CLOSED]
-151  Improving Tor Path Selection [FINISHED]
+151  Improving Tor Path Selection [CLOSED]
 152  Optionally allow exit from single-hop circuits [CLOSED]
 153  Automatic software update protocol [SUPERSEDED]
 154  Automatic Software Update Protocol [SUPERSEDED]
@@ -81,7 +81,7 @@ Proposals by number:
 158  Clients download consensus + microdescriptors [FINISHED]
 159  Exit Scanning [INFORMATIONAL]
 160  Authorities vote for bandwidth offsets in consensus [FINISHED]
-161  Computing Bandwidth Adjustments [FINISHED]
+161  Computing Bandwidth Adjustments [CLOSED]
 162  Publish the consensus in multiple flavors [FINISHED]
 163  Detecting whether a connection comes from a client [SUPERSEDED]
 164  Reporting the status of server votes [OPEN]
@@ -267,10 +267,8 @@ Proposals by status:
099  Miscellaneous proposals
257  Refactoring authorities and making them more isolated from the net
  FINISHED:
-   151  Improving Tor Path Selection [in 0.2.2.2-alpha]
158  Clients download consensus + microdescriptors [in 0.2.3.1-alpha]
160  Authorities vote for bandwidth offsets in consensus [for 0.2.1.x]
-   161  Computing Bandwidth Adjustments [for 0.2.1.x]
162  Publish the consensus in multiple flavors [in 0.2.3.1-alpha]
196  Extended ORPort and TransportControlPort [in 0.2.5.2-alpha]
217  Tor Extended ORPort Authentication [for 0.2.5.x]
@@ -309,9 +307,11 @@ Proposals by status:
140  Provide diffs between consensuses [in 0.3.1.1-alpha]
148  Stream end reasons from the client side should be uniform [in 
0.2.1.9-alpha]
150  Exclude Exit Nodes from a circuit [in 0.2.1.3-alpha]
+   151  Improving Tor Path Selection [in 0.2.2.2-alpha]
152  Optionally allow exit from single-hop circuits [in 0.2.1.6-alpha]
155  Four Improvements of Hidden Service Performance [in 0.2.1.x]
157  Make certificate downloads specific [for 0.2.4.x]
+   161  Computing Bandwidth Adjustments [for 0.2.1.x]
166  Including Network Statistics in Extra-Info Documents [for 0.2.2]
167  Vote on network parameters in consensus [in 0.2.2]
171  Separate streams across circuits by connection metadata [in 
0.2.3.3-alpha]
diff --git a/proposals/151-path-selection-improvements.txt 
b/proposals/151-path-selection-improvements.txt
index 7e2d113..e92b574 100644
--- a/proposals/151-path-selection-improvements.txt
+++ b/proposals/151-path-selection-improvements.txt
@@ -2,7 +2,7 @@ Filename: 151-path-selection-improvements.txt
 Title: Improving Tor Path Selection
 Author: Fallon Chen, Mike Perry
 Created: 5-Jul-2008
-Status: Finished
+Status: Closed
 In-Spec: path-spec.txt
 Implemented-In: 0.2.2.2-alpha
 
diff --git a/proposals/161-computing-bandwidth-adjustments.txt 
b/proposals/161-computing-bandwidth-adjustments.txt
index a0ad429..6968724 100644
--- a/proposals/161-computing-bandwidth-adjustments.txt
+++ b/proposals/161-computing-bandwidth-adjustments.txt
@@ -3,7 +3,7 @@ Filename: 161-computing-bandwidth-adjustments.txt
 Author: Mike Perry
 Created: 12-May-2009
 Target: 0.2.1.x
-Status: Finished
+Status: Closed
 
 
 1. Motivation

___
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.0] Merge branch 'maint-0.3.0' into release-0.3.0

2017-05-18 Thread nickm

commit bd62f78ebd10f975522e6a36fcef3f4f6c488440
Merge: 4663bec 935cd77
Author: Nick Mathewson 
Date:   Thu May 18 10:06:19 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22252  |  3 +++
 src/or/circuitstats.c | 11 ++-
 src/or/circuitstats.h |  3 +++
 src/or/config.c   |  2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

___
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.0'

2017-05-18 Thread nickm

commit b214c2c0955373bdf0eab6954c19dd9b559200cf
Merge: e04da28 935cd77
Author: Nick Mathewson 
Date:   Thu May 18 10:06:27 2017 -0400

Merge branch 'maint-0.3.0'

 changes/bug22252  |  3 +++
 src/or/circuitstats.c | 11 ++-
 src/or/circuitstats.h |  3 +++
 src/or/config.c   |  2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

___
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 'bug22252_029' into maint-0.3.0

2017-05-18 Thread nickm

commit 935cd77f62f036e615923742de278398aa85f2bf
Merge: 492f8a7 2ba58f2
Author: Nick Mathewson 
Date:   Thu May 18 10:06:06 2017 -0400

Merge branch 'bug22252_029' into maint-0.3.0

 changes/bug22252  |  3 +++
 src/or/circuitstats.c | 11 ++-
 src/or/circuitstats.h |  3 +++
 src/or/config.c   |  2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --cc src/or/circuitstats.c
index 48cb89d,d4487cf..6e73372
--- a/src/or/circuitstats.c
+++ b/src/or/circuitstats.c
@@@ -105,8 -105,16 +105,16 @@@ get_circuit_build_timeout_ms(void
   *  6. If we are configured in Single Onion mode
   */
  int
 -circuit_build_times_disabled(void)
 +circuit_build_times_disabled(const or_options_t *options)
  {
 -  return circuit_build_times_disabled_(get_options());
++  return circuit_build_times_disabled_(options, 0);
+ }
+ 
+ /** As circuit_build_times_disabled, but take options as an argument. */
+ int
+ circuit_build_times_disabled_(const or_options_t *options,
+   int ignore_consensus)
+ {
if (unit_tests) {
  return 0;
} else {
diff --cc src/or/circuitstats.h
index 2391027,38a994d..c748f82
--- a/src/or/circuitstats.h
+++ b/src/or/circuitstats.h
@@@ -17,7 -17,10 +17,10 @@@ circuit_build_times_t *get_circuit_buil
  double get_circuit_build_close_time_ms(void);
  double get_circuit_build_timeout_ms(void);
  
 -int circuit_build_times_disabled(void);
 +int circuit_build_times_disabled(const or_options_t *options);
+ int circuit_build_times_disabled_(const or_options_t *options,
+   int ignore_consensus);
+ 
  int circuit_build_times_enough_to_compute(const circuit_build_times_t *cbt);
  void circuit_build_times_update_state(const circuit_build_times_t *cbt,
or_state_t *state);



___
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.0] Fix crash when starting with LearnCircuitBuildTimeout 0.

2017-05-18 Thread nickm

commit 2ba58f275cef6ae70c0d6f5a94f8bd3ff99f1e5e
Author: Nick Mathewson 
Date:   Tue May 16 11:20:12 2017 -0400

Fix crash when starting with LearnCircuitBuildTimeout 0.

Before we've set our options, we can neither call get_options() nor
networkstatus_get_latest_consensus().

Fixes bug 22252; bugfix on 4d9d2553baa6856b1d85ec26baa1ac3d2c24832a
in 0.2.9.3-alpha.
---
 changes/bug22252  |  3 +++
 src/or/circuitstats.c | 12 ++--
 src/or/circuitstats.h |  3 +++
 src/or/config.c   |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/changes/bug22252 b/changes/bug22252
new file mode 100644
index 000..42b9d8e
--- /dev/null
+++ b/changes/bug22252
@@ -0,0 +1,3 @@
+  o Minor bugfixes (configuration):
+- Do not crash when starting with LearnCircuitBuildTimeout 0.
+  Fixes bug 22252; bugfix on 0.2.9.3-alpha.
diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c
index 418acc0..d4487cf 100644
--- a/src/or/circuitstats.c
+++ b/src/or/circuitstats.c
@@ -107,11 +107,19 @@ get_circuit_build_timeout_ms(void)
 int
 circuit_build_times_disabled(void)
 {
+  return circuit_build_times_disabled_(get_options());
+}
+
+/** As circuit_build_times_disabled, but take options as an argument. */
+int
+circuit_build_times_disabled_(const or_options_t *options,
+  int ignore_consensus)
+{
   if (unit_tests) {
 return 0;
   } else {
-const or_options_t *options = get_options();
-int consensus_disabled = networkstatus_get_param(NULL, "cbtdisabled",
+int consensus_disabled =
+  ignore_consensus ? 0 : networkstatus_get_param(NULL, "cbtdisabled",
  0, 0, 1);
 int config_disabled = !options->LearnCircuitBuildTimeout;
 int dirauth_disabled = options->AuthoritativeDir;
diff --git a/src/or/circuitstats.h b/src/or/circuitstats.h
index 72b1609..38a994d 100644
--- a/src/or/circuitstats.h
+++ b/src/or/circuitstats.h
@@ -18,6 +18,9 @@ double get_circuit_build_close_time_ms(void);
 double get_circuit_build_timeout_ms(void);
 
 int circuit_build_times_disabled(void);
+int circuit_build_times_disabled_(const or_options_t *options,
+  int ignore_consensus);
+
 int circuit_build_times_enough_to_compute(const circuit_build_times_t *cbt);
 void circuit_build_times_update_state(const circuit_build_times_t *cbt,
   or_state_t *state);
diff --git a/src/or/config.c b/src/or/config.c
index 3693cdf..dd9f4eb 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3450,7 +3450,7 @@ options_validate(or_options_t *old_options, or_options_t 
*options,
 int severity = LOG_NOTICE;
 /* Be a little quieter if we've deliberately disabled
  * LearnCircuitBuildTimeout. */
-if (circuit_build_times_disabled()) {
+if (circuit_build_times_disabled_(options, 1)) {
   severity = LOG_INFO;
 }
 log_fn(severity, LD_CONFIG, "You disabled LearnCircuitBuildTimeout, but "



___
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.0] Merge branch 'bug22252_029' into maint-0.3.0

2017-05-18 Thread nickm

commit 935cd77f62f036e615923742de278398aa85f2bf
Merge: 492f8a7 2ba58f2
Author: Nick Mathewson 
Date:   Thu May 18 10:06:06 2017 -0400

Merge branch 'bug22252_029' into maint-0.3.0

 changes/bug22252  |  3 +++
 src/or/circuitstats.c | 11 ++-
 src/or/circuitstats.h |  3 +++
 src/or/config.c   |  2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --cc src/or/circuitstats.c
index 48cb89d,d4487cf..6e73372
--- a/src/or/circuitstats.c
+++ b/src/or/circuitstats.c
@@@ -105,8 -105,16 +105,16 @@@ get_circuit_build_timeout_ms(void
   *  6. If we are configured in Single Onion mode
   */
  int
 -circuit_build_times_disabled(void)
 +circuit_build_times_disabled(const or_options_t *options)
  {
 -  return circuit_build_times_disabled_(get_options());
++  return circuit_build_times_disabled_(options, 0);
+ }
+ 
+ /** As circuit_build_times_disabled, but take options as an argument. */
+ int
+ circuit_build_times_disabled_(const or_options_t *options,
+   int ignore_consensus)
+ {
if (unit_tests) {
  return 0;
} else {
diff --cc src/or/circuitstats.h
index 2391027,38a994d..c748f82
--- a/src/or/circuitstats.h
+++ b/src/or/circuitstats.h
@@@ -17,7 -17,10 +17,10 @@@ circuit_build_times_t *get_circuit_buil
  double get_circuit_build_close_time_ms(void);
  double get_circuit_build_timeout_ms(void);
  
 -int circuit_build_times_disabled(void);
 +int circuit_build_times_disabled(const or_options_t *options);
+ int circuit_build_times_disabled_(const or_options_t *options,
+   int ignore_consensus);
+ 
  int circuit_build_times_enough_to_compute(const circuit_build_times_t *cbt);
  void circuit_build_times_update_state(const circuit_build_times_t *cbt,
or_state_t *state);

___
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.0] Merge branch 'bug22252_029' into maint-0.3.0

2017-05-18 Thread nickm

commit 935cd77f62f036e615923742de278398aa85f2bf
Merge: 492f8a7 2ba58f2
Author: Nick Mathewson 
Date:   Thu May 18 10:06:06 2017 -0400

Merge branch 'bug22252_029' into maint-0.3.0

 changes/bug22252  |  3 +++
 src/or/circuitstats.c | 11 ++-
 src/or/circuitstats.h |  3 +++
 src/or/config.c   |  2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --cc src/or/circuitstats.c
index 48cb89d,d4487cf..6e73372
--- a/src/or/circuitstats.c
+++ b/src/or/circuitstats.c
@@@ -105,8 -105,16 +105,16 @@@ get_circuit_build_timeout_ms(void
   *  6. If we are configured in Single Onion mode
   */
  int
 -circuit_build_times_disabled(void)
 +circuit_build_times_disabled(const or_options_t *options)
  {
 -  return circuit_build_times_disabled_(get_options());
++  return circuit_build_times_disabled_(options, 0);
+ }
+ 
+ /** As circuit_build_times_disabled, but take options as an argument. */
+ int
+ circuit_build_times_disabled_(const or_options_t *options,
+   int ignore_consensus)
+ {
if (unit_tests) {
  return 0;
} else {
diff --cc src/or/circuitstats.h
index 2391027,38a994d..c748f82
--- a/src/or/circuitstats.h
+++ b/src/or/circuitstats.h
@@@ -17,7 -17,10 +17,10 @@@ circuit_build_times_t *get_circuit_buil
  double get_circuit_build_close_time_ms(void);
  double get_circuit_build_timeout_ms(void);
  
 -int circuit_build_times_disabled(void);
 +int circuit_build_times_disabled(const or_options_t *options);
+ int circuit_build_times_disabled_(const or_options_t *options,
+   int ignore_consensus);
+ 
  int circuit_build_times_enough_to_compute(const circuit_build_times_t *cbt);
  void circuit_build_times_update_state(const circuit_build_times_t *cbt,
or_state_t *state);



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

[tor-commits] [tor/master] Fix crash when starting with LearnCircuitBuildTimeout 0.

2017-05-18 Thread nickm

commit 2ba58f275cef6ae70c0d6f5a94f8bd3ff99f1e5e
Author: Nick Mathewson 
Date:   Tue May 16 11:20:12 2017 -0400

Fix crash when starting with LearnCircuitBuildTimeout 0.

Before we've set our options, we can neither call get_options() nor
networkstatus_get_latest_consensus().

Fixes bug 22252; bugfix on 4d9d2553baa6856b1d85ec26baa1ac3d2c24832a
in 0.2.9.3-alpha.
---
 changes/bug22252  |  3 +++
 src/or/circuitstats.c | 12 ++--
 src/or/circuitstats.h |  3 +++
 src/or/config.c   |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/changes/bug22252 b/changes/bug22252
new file mode 100644
index 000..42b9d8e
--- /dev/null
+++ b/changes/bug22252
@@ -0,0 +1,3 @@
+  o Minor bugfixes (configuration):
+- Do not crash when starting with LearnCircuitBuildTimeout 0.
+  Fixes bug 22252; bugfix on 0.2.9.3-alpha.
diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c
index 418acc0..d4487cf 100644
--- a/src/or/circuitstats.c
+++ b/src/or/circuitstats.c
@@ -107,11 +107,19 @@ get_circuit_build_timeout_ms(void)
 int
 circuit_build_times_disabled(void)
 {
+  return circuit_build_times_disabled_(get_options());
+}
+
+/** As circuit_build_times_disabled, but take options as an argument. */
+int
+circuit_build_times_disabled_(const or_options_t *options,
+  int ignore_consensus)
+{
   if (unit_tests) {
 return 0;
   } else {
-const or_options_t *options = get_options();
-int consensus_disabled = networkstatus_get_param(NULL, "cbtdisabled",
+int consensus_disabled =
+  ignore_consensus ? 0 : networkstatus_get_param(NULL, "cbtdisabled",
  0, 0, 1);
 int config_disabled = !options->LearnCircuitBuildTimeout;
 int dirauth_disabled = options->AuthoritativeDir;
diff --git a/src/or/circuitstats.h b/src/or/circuitstats.h
index 72b1609..38a994d 100644
--- a/src/or/circuitstats.h
+++ b/src/or/circuitstats.h
@@ -18,6 +18,9 @@ double get_circuit_build_close_time_ms(void);
 double get_circuit_build_timeout_ms(void);
 
 int circuit_build_times_disabled(void);
+int circuit_build_times_disabled_(const or_options_t *options,
+  int ignore_consensus);
+
 int circuit_build_times_enough_to_compute(const circuit_build_times_t *cbt);
 void circuit_build_times_update_state(const circuit_build_times_t *cbt,
   or_state_t *state);
diff --git a/src/or/config.c b/src/or/config.c
index 3693cdf..dd9f4eb 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3450,7 +3450,7 @@ options_validate(or_options_t *old_options, or_options_t 
*options,
 int severity = LOG_NOTICE;
 /* Be a little quieter if we've deliberately disabled
  * LearnCircuitBuildTimeout. */
-if (circuit_build_times_disabled()) {
+if (circuit_build_times_disabled_(options, 1)) {
   severity = LOG_INFO;
 }
 log_fn(severity, LD_CONFIG, "You disabled LearnCircuitBuildTimeout, but "



___
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.0] Fix crash when starting with LearnCircuitBuildTimeout 0.

2017-05-18 Thread nickm

commit 2ba58f275cef6ae70c0d6f5a94f8bd3ff99f1e5e
Author: Nick Mathewson 
Date:   Tue May 16 11:20:12 2017 -0400

Fix crash when starting with LearnCircuitBuildTimeout 0.

Before we've set our options, we can neither call get_options() nor
networkstatus_get_latest_consensus().

Fixes bug 22252; bugfix on 4d9d2553baa6856b1d85ec26baa1ac3d2c24832a
in 0.2.9.3-alpha.
---
 changes/bug22252  |  3 +++
 src/or/circuitstats.c | 12 ++--
 src/or/circuitstats.h |  3 +++
 src/or/config.c   |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/changes/bug22252 b/changes/bug22252
new file mode 100644
index 000..42b9d8e
--- /dev/null
+++ b/changes/bug22252
@@ -0,0 +1,3 @@
+  o Minor bugfixes (configuration):
+- Do not crash when starting with LearnCircuitBuildTimeout 0.
+  Fixes bug 22252; bugfix on 0.2.9.3-alpha.
diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c
index 418acc0..d4487cf 100644
--- a/src/or/circuitstats.c
+++ b/src/or/circuitstats.c
@@ -107,11 +107,19 @@ get_circuit_build_timeout_ms(void)
 int
 circuit_build_times_disabled(void)
 {
+  return circuit_build_times_disabled_(get_options());
+}
+
+/** As circuit_build_times_disabled, but take options as an argument. */
+int
+circuit_build_times_disabled_(const or_options_t *options,
+  int ignore_consensus)
+{
   if (unit_tests) {
 return 0;
   } else {
-const or_options_t *options = get_options();
-int consensus_disabled = networkstatus_get_param(NULL, "cbtdisabled",
+int consensus_disabled =
+  ignore_consensus ? 0 : networkstatus_get_param(NULL, "cbtdisabled",
  0, 0, 1);
 int config_disabled = !options->LearnCircuitBuildTimeout;
 int dirauth_disabled = options->AuthoritativeDir;
diff --git a/src/or/circuitstats.h b/src/or/circuitstats.h
index 72b1609..38a994d 100644
--- a/src/or/circuitstats.h
+++ b/src/or/circuitstats.h
@@ -18,6 +18,9 @@ double get_circuit_build_close_time_ms(void);
 double get_circuit_build_timeout_ms(void);
 
 int circuit_build_times_disabled(void);
+int circuit_build_times_disabled_(const or_options_t *options,
+  int ignore_consensus);
+
 int circuit_build_times_enough_to_compute(const circuit_build_times_t *cbt);
 void circuit_build_times_update_state(const circuit_build_times_t *cbt,
   or_state_t *state);
diff --git a/src/or/config.c b/src/or/config.c
index 3693cdf..dd9f4eb 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3450,7 +3450,7 @@ options_validate(or_options_t *old_options, or_options_t 
*options,
 int severity = LOG_NOTICE;
 /* Be a little quieter if we've deliberately disabled
  * LearnCircuitBuildTimeout. */
-if (circuit_build_times_disabled()) {
+if (circuit_build_times_disabled_(options, 1)) {
   severity = LOG_INFO;
 }
 log_fn(severity, LD_CONFIG, "You disabled LearnCircuitBuildTimeout, but "



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

[tor-commits] [torspec/master] Mark proposals 121 and 155 as closed.

2017-05-18 Thread nickm

commit 65fc15c92779cce42c64322bede7a68b74a1d702
Author: Nick Mathewson 
Date:   Thu May 18 09:55:34 2017 -0400

Mark proposals 121 and 155 as closed.

According to Karsten, 121 has long been merged into rend-spec.txt,
and 155 is implementation-specific stuff that doesn't affect the
protocol itself.
---
 proposals/000-index.txt| 8 
 proposals/121-hidden-service-authentication.txt| 2 +-
 proposals/155-four-hidden-service-improvements.txt | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index 405b4ff..62d6414 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -41,7 +41,7 @@ Proposals by number:
 118  Advertising multiple ORPorts at once [SUPERSEDED]
 119  New PROTOCOLINFO command for controllers [CLOSED]
 120  Shutdown descriptors when Tor servers stop [DEAD]
-121  Hidden Service Authentication [FINISHED]
+121  Hidden Service Authentication [CLOSED]
 122  Network status entries need a new Unnamed flag [CLOSED]
 123  Naming authorities automatically create bindings [CLOSED]
 124  Blocking resistant TLS certificate usage [SUPERSEDED]
@@ -75,7 +75,7 @@ Proposals by number:
 152  Optionally allow exit from single-hop circuits [CLOSED]
 153  Automatic software update protocol [SUPERSEDED]
 154  Automatic Software Update Protocol [SUPERSEDED]
-155  Four Improvements of Hidden Service Performance [FINISHED]
+155  Four Improvements of Hidden Service Performance [CLOSED]
 156  Tracking blocked ports on the client side [SUPERSEDED]
 157  Make certificate downloads specific [CLOSED]
 158  Clients download consensus + microdescriptors [FINISHED]
@@ -267,9 +267,7 @@ Proposals by status:
099  Miscellaneous proposals
257  Refactoring authorities and making them more isolated from the net
  FINISHED:
-   121  Hidden Service Authentication [in 0.2.1.x]
151  Improving Tor Path Selection [in 0.2.2.2-alpha]
-   155  Four Improvements of Hidden Service Performance [in 0.2.1.x]
158  Clients download consensus + microdescriptors [in 0.2.3.1-alpha]
160  Authorities vote for bandwidth offsets in consensus [for 0.2.1.x]
161  Computing Bandwidth Adjustments [for 0.2.1.x]
@@ -296,6 +294,7 @@ Proposals by status:
114  Distributed Storage for Tor Hidden Service Descriptors [in 0.2.0.x]
117  IPv6 exits [for 0.2.4.x] [in 0.2.4.7-alpha]
119  New PROTOCOLINFO command for controllers [in 0.2.0.x]
+   121  Hidden Service Authentication [in 0.2.1.x]
122  Network status entries need a new Unnamed flag [in 0.2.0.x]
123  Naming authorities automatically create bindings [in 0.2.0.x]
125  Behavior for bridge users, bridge relays, and bridge authorities [in 
0.2.0.x]
@@ -311,6 +310,7 @@ Proposals by status:
148  Stream end reasons from the client side should be uniform [in 
0.2.1.9-alpha]
150  Exclude Exit Nodes from a circuit [in 0.2.1.3-alpha]
152  Optionally allow exit from single-hop circuits [in 0.2.1.6-alpha]
+   155  Four Improvements of Hidden Service Performance [in 0.2.1.x]
157  Make certificate downloads specific [for 0.2.4.x]
166  Including Network Statistics in Extra-Info Documents [for 0.2.2]
167  Vote on network parameters in consensus [in 0.2.2]
diff --git a/proposals/121-hidden-service-authentication.txt 
b/proposals/121-hidden-service-authentication.txt
index 0d92b53..8dd59e9 100644
--- a/proposals/121-hidden-service-authentication.txt
+++ b/proposals/121-hidden-service-authentication.txt
@@ -3,7 +3,7 @@ Title: Hidden Service Authentication
 Author: Tobias Kamm, Thomas Lauterbach, Karsten Loesing, Ferdinand Rieger,
 Christoph Weingarten
 Created: 10-Sep-2007
-Status: Finished
+Status: Closed
 Implemented-In: 0.2.1.x
 
 Change history:
diff --git a/proposals/155-four-hidden-service-improvements.txt 
b/proposals/155-four-hidden-service-improvements.txt
index e342bf1..423c9e8 100644
--- a/proposals/155-four-hidden-service-improvements.txt
+++ b/proposals/155-four-hidden-service-improvements.txt
@@ -2,7 +2,7 @@ Filename: 155-four-hidden-service-improvements.txt
 Title: Four Improvements of Hidden Service Performance
 Author: Karsten Loesing, Christian Wilms
 Created: 25-Sep-2008
-Status: Finished
+Status: Closed
 Implemented-In: 0.2.1.x
 
 Change history:

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

[tor-commits] [tor/master] Fixed error on BASEXX_NOPAD LEN and BUFSIZE macros #21872

2017-05-18 Thread nickm

commit e04da2828d6bbf1499d3df5ba85a8baf4c485bb7
Author: Daniel Pinto 
Date:   Wed May 17 00:22:11 2017 +0100

Fixed error on BASEXX_NOPAD LEN and BUFSIZE macros #21872
---
 src/common/util_format.h | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common/util_format.h b/src/common/util_format.h
index adf48c0..4af8832 100644
--- a/src/common/util_format.h
+++ b/src/common/util_format.h
@@ -23,11 +23,11 @@
 #define BASE32_BUFSIZE(n) (BASE32_LEN(n) + 1)
 #define BASE16_BUFSIZE(n) (BASE16_LEN(n) + 1)
 
-#define BASE64_NOPAD_LEN(n) (CEIL_DIV((n) * 4, 3)
-#define BASE32_NOPAD_LEN(n) (CEIL_DIV((n) * 8, 5)
+#define BASE64_NOPAD_LEN(n) (CEIL_DIV((n) * 4, 3))
+#define BASE32_NOPAD_LEN(n) (CEIL_DIV((n) * 8, 5))
 
-#define BASE64_NOPAD_BUFSIZE(n) (BASE64_NOPAD_LEN(n) + 1))
-#define BASE32_NOPAD_BUFSIZE(n) (BASE32_NOPAD_LEN(n) + 1))
+#define BASE64_NOPAD_BUFSIZE(n) (BASE64_NOPAD_LEN(n) + 1)
+#define BASE32_NOPAD_BUFSIZE(n) (BASE32_NOPAD_LEN(n) + 1)
 /** @} */
 
 #define BASE64_ENCODE_MULTILINE 1

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

[tor-commits] [webwml/master] Deprecate old Tor Browser version: 7.0a3

2017-05-18 Thread boklm

commit 0f01c76ad4a3d5aa6ed52edf94a5b6c6a4cbcdd3
Author: Nicolas Vigier 
Date:   Thu May 18 12:15:26 2017 +0200

Deprecate old Tor Browser version: 7.0a3
---
 projects/torbrowser/RecommendedTBBVersions | 4 
 1 file changed, 4 deletions(-)

diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 1c6b754..33c69e5 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -3,10 +3,6 @@
 "6.5.2-Linux",
 "6.5.2-MacOS",
 "6.5.2-Windows",
-"7.0a3",
-"7.0a3-Linux",
-"7.0a3-MacOS",
-"7.0a3-Windows",
 "7.0a4",
 "7.0a4-Linux",
 "7.0a4-MacOS",

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

[tor-commits] [atlas/master] Fix the styling of the graph sections

2017-05-18 Thread irl

commit 6aebf7385063b79b20401d5ca648c1eafd152ff4
Author: cypherpunks 
Date:   Fri May 12 14:09:51 2017 +

Fix the styling of the graph sections

The graph sections used incorrect spacing because of missing column
specifications.

Part of #22239.
---
 templates/details/bridge.html | 40 +++-
 templates/details/router.html | 42 +++---
 2 files changed, 6 insertions(+), 76 deletions(-)

diff --git a/templates/details/bridge.html b/templates/details/bridge.html
index fda73f6..a34701b 100644
--- a/templates/details/bridge.html
+++ b/templates/details/bridge.html
@@ -91,6 +91,7 @@
 
 
 
+
 
 
   
@@ -103,10 +104,6 @@
 
   
   
-
-
-
-
 
   
 
@@ -119,11 +116,6 @@
 
   
 
-  
-
-
-
-
 
   
 
@@ -135,10 +127,6 @@
 
   
   
-
-
-
-
 
   
 
@@ -152,7 +140,9 @@
   
 
   
+
 
+
 
 
   
@@ -166,11 +156,6 @@
 
   
 
-  
-
-
-
-
 
   
 
@@ -182,10 +167,6 @@
 
   
   
-
-
-
-
 
   
 
@@ -198,11 +179,6 @@
 
   
 
-  
-
-
-
-
 
   
 
@@ -214,10 +190,6 @@
 
   
   
-
-
-
-
 
   
 
@@ -232,10 +204,4 @@
 
   
 
-
-
diff --git a/templates/details/router.html b/templates/details/router.html
index e72dbd9..46f935f 100644
--- a/templates/details/router.html
+++ b/templates/details/router.html
@@ -145,6 +145,7 @@
 
 
 
+
 
 
   
@@ -157,10 +158,6 @@
 
   
   
-
-
-
-
 
   
 
@@ -173,11 +170,6 @@
 
   
 
-  
-
-
-
-
 
   
 
@@ -189,10 +181,6 @@
 
   
   
-
-
-
-
 
   
 
@@ -207,8 +195,10 @@
 
   
 
+
 
 
+
 
 
   
@@ -222,11 +212,6 @@
 
   
 
-  
-
-
-
-
 
   
 
@@ -239,11 +224,6 @@
 
   
 
-  
-
-
-
-
 
   
 
@@ -256,11 +236,6 @@
 
   
 
-  
-
-
-
-
 
   
 
@@ -273,11 +248,6 @@
 
   
 
-  
-
-
-
-
 
   
 
@@ -292,10 +262,4 @@
 
   
 
-
-



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

[tor-commits] [atlas/master] Use the page-header class to accentuate headers

2017-05-18 Thread irl

commit e7da05520151ae1de960a45437ee6bd31a9d16ee
Author: cypherpunks 
Date:   Fri May 12 14:11:19 2017 +

Use the page-header class to accentuate headers

The page-header class uses a bottom border which makes using horizontal
rules obsolete.

Closes #22239.
---
 index.html| 4 +++-
 templates/about.html  | 4 ++--
 templates/details/bridge.html | 6 +++---
 templates/details/router.html | 6 +++---
 templates/search/do.html  | 2 ++
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/index.html b/index.html
index bbd70c2..6d2b684 100644
--- a/index.html
+++ b/index.html
@@ -52,8 +52,10 @@
   
   
 
+  
   JavaScript required
-  Please enable JavaScript to use this service.
+  
+  Please enable JavaScript to use this service.
 
   
   
diff --git a/templates/about.html b/templates/about.html
index 1cff2b4..f24c807 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -1,9 +1,9 @@
-
+
 Atlas
+
 
 Atlas is a web application to discover Tor relays. It provides useful 
information on how relays are configured along with graphics about their past.
 
-
 
 
 Features
diff --git a/templates/details/bridge.html b/templates/details/bridge.html
index a34701b..c2e5b80 100644
--- a/templates/details/bridge.html
+++ b/templates/details/bridge.html
@@ -7,8 +7,9 @@
 <% } %>
 
 
+
 General Overall information on the Tor bridge
-
+
 
 
 
@@ -85,9 +86,8 @@
 
 
 
-
+
 Graphs Pretty graphs
-
 
 
 
diff --git a/templates/details/router.html b/templates/details/router.html
index 46f935f..7ea26bf 100644
--- a/templates/details/router.html
+++ b/templates/details/router.html
@@ -7,8 +7,9 @@
 <% } %>
 
 
+
 General Overall information on the Tor relay
-
+
 
 
 
@@ -139,9 +140,8 @@
 
 
 
-
+
 Graphs Pretty graphs
-
 
 
 
diff --git a/templates/search/do.html b/templates/search/do.html
index 02dbe1a..a117d0e 100644
--- a/templates/search/do.html
+++ b/templates/search/do.html
@@ -49,7 +49,9 @@
 
 <% } %>
 
+
 
+
 



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

[tor-commits] [atlas/master] Remove logging to the console

2017-05-18 Thread irl

commit 38631e5bf458c4c6521d1d1e958062d09cb3c4af
Author: cypherpunks 
Date:   Tue May 16 09:09:55 2017 +

Remove logging to the console

Closes #22272.
---
 js/collections/results.js  | 13 ---
 js/libs/datatables/dataTables.TorStatus.js |  2 --
 js/models/graph.js |  2 --
 js/models/relay.js | 11 +++--
 js/router.js   |  1 -
 js/views/details/main.js   |  2 --
 js/views/search/do.js  | 36 ++
 7 files changed, 5 insertions(+), 62 deletions(-)

diff --git a/js/collections/results.js b/js/collections/results.js
index 13cf7ac..c341321 100644
--- a/js/collections/results.js
+++ b/js/collections/results.js
@@ -20,7 +20,6 @@ define([
 this.valid_after = response.valid_after;
 var relays = [];
 options.error = function(options) {
-console.log('error..');
 error(options.error, collection, options);
 }
 _.each(response.relays, function(relay, resultsC) {
@@ -35,12 +34,10 @@ define([
 });
 if (relays.length == 0) {
 error(0);
-console.log('Empty result set was returned');
 return false;
 } else if (relays.length > 50) {
relays = relays.slice(0, 50);
err = 4;
-   console.log(options);
 }
 var lookedUpRelays = 0;
 _.each(relays, function(relay) {
@@ -56,7 +53,6 @@ define([
 lookedUp();
 },
 error: function() {
-console.log("error in loading one relay..");
 lookedUp();
 error(0);
 }
@@ -64,20 +60,11 @@ define([
 });
 }).error(
 function(jqXHR, textStatus, errorThrown) {
-console.log(jqXHR);
 if(jqXHR.statusText == "error") {
 error(2);
 } else {
 error(3);
 }
-/*
-console.log("jqXHR: " +
-jqXHR + " textStauts: " +
-textStatus + " errorThrown: " +
-errorThrown);
-console.log("error in doing query..");
-error(2)
-*/
 }
 );
 }
diff --git a/js/libs/datatables/dataTables.TorStatus.js 
b/js/libs/datatables/dataTables.TorStatus.js
index 19b0ee0..b5319ed 100644
--- a/js/libs/datatables/dataTables.TorStatus.js
+++ b/js/libs/datatables/dataTables.TorStatus.js
@@ -13,8 +13,6 @@ $.fn.dataTableExt.afnFiltering.push(
function( oSettings, aData, iDataIndex ) {
var iMin = document.getElementById('bw_from').value * 1;
var iMax = document.getElementById('bw_from').value * 1;
-console.log("iMin: "+iMin+" iMax: "+iMax);
-console.log(aData);
var iVersion = aData[3] == "-" ? 0 : aData[3]*1;
 
if ( iMin == "" && iMax == "" )
diff --git a/js/models/graph.js b/js/models/graph.js
index 1f356db..668fc6d 100644
--- a/js/models/graph.js
+++ b/js/models/graph.js
@@ -12,8 +12,6 @@ define([
 var first = history[period].first.split(' ');
 var date = first[0].split('-');
 var time = first[1].split(':');
-//console.log(date);
-//console.log(time);
 first = new Date(date[0], date[1]-1, date[2],
 time[0], time[1], time[2]);
 var y = first.getTime();
diff --git a/js/models/relay.js b/js/models/relay.js
index d53eb81..1cd4f74 100644
--- a/js/models/relay.js
+++ b/js/models/relay.js
@@ -75,10 +75,6 @@ define([
 secs = secs % 60;
 mins = mins % 60;
 hours = hours % 24;
-// console.log("secs: "+secs);
-// console.log("mins: "+mins);
-// console.log("hours: "+hours);
-// console.log("days: "+days);
 var hr_date = "";
 var hr_date_full = "";
 var hr = 0;
@@ -135,7 +131,6 @@ define([
 var success = options.success;
 var error = options.error;
 var model = this;
-console.log("doing query..");
 var xhr = 
$.getJSON(this.baseurl+'/details?lookup='+this.fingerprint, function(data) {
 checkIfDataIsUpToDate(xhr.getResponseHeader("Last-Modified"));
 var relay = null;
@@ -147,7 +142,6 @@ define([
 relay.is_bridge = true;
 }
 if (relay) {
-//console.log(data);

47 matches

Mail list logo