date:20180102

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

2018-01-02 Thread nickm

commit bd9739bae6230440c07fc67174ad37f019dfc412
Merge: bc5ef83f8 2aa1767b2
Author: Nick Mathewson 
Date:   Tue Jan 2 14:42:31 2018 -0500

Merge branch 'maint-0.3.2'

 src/config/torrc.minimal.in-staging |  6 +-
 src/config/torrc.sample.in  | 13 +++--
 2 files changed, 16 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/release-0.3.2] Clarify the OutboundBindAddressOR documentation in the sample torrc

2018-01-02 Thread nickm

commit d10c2d66686180f774ae946e7dc65070dd33cac1
Author: teor 
Date:   Fri Dec 22 11:22:10 2017 +1100

Clarify the OutboundBindAddressOR documentation in the sample torrc

Part of 22145
---
 src/config/torrc.sample.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 47e4ef9eb..4728aff9b 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -96,7 +96,8 @@
 ## If you have multiple network interfaces, you can specify one for
 ## outgoing traffic to use.
 ## OutboundBindAddressExit will be used for all exit traffic, while
-## OutboundBindAddressOR will be used for all other connections.
+## OutboundBindAddressOR will be used for all OR and Dir connections
+## (DNS connections ignore OutboundBindAddress).
 ## If you do not wish to differentiate, use OutboundBindAddress to
 ## specify the same address for both in a single line.
 #OutboundBindAddressExit 10.0.0.4



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

[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'teor/bug24703_032' into maint-0.3.2

2018-01-02 Thread nickm

commit 2aa1767b25e6b2b04892696c4c00e0257feb3812
Merge: 707076002 a8e8ce860
Author: Nick Mathewson 
Date:   Tue Jan 2 14:42:27 2018 -0500

Merge remote-tracking branch 'teor/bug24703_032' into maint-0.3.2

 src/config/torrc.minimal.in-staging |  6 +-
 src/config/torrc.sample.in  | 13 +++--
 2 files changed, 16 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/release-0.3.2] Merge remote-tracking branch 'teor/bug24703_032' into maint-0.3.2

2018-01-02 Thread nickm

commit 2aa1767b25e6b2b04892696c4c00e0257feb3812
Merge: 707076002 a8e8ce860
Author: Nick Mathewson 
Date:   Tue Jan 2 14:42:27 2018 -0500

Merge remote-tracking branch 'teor/bug24703_032' into maint-0.3.2

 src/config/torrc.minimal.in-staging |  6 +-
 src/config/torrc.sample.in  | 13 +++--
 2 files changed, 16 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/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-02 Thread nickm

commit 99b4f868332b3ae304e669240657994022d69991
Merge: fd46d8d0a 2aa1767b2
Author: Nick Mathewson 
Date:   Tue Jan 2 14:42:31 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 src/config/torrc.minimal.in-staging |  6 +-
 src/config/torrc.sample.in  | 13 +++--
 2 files changed, 16 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 the dates and Tor versions on the sample torrcs

2018-01-02 Thread nickm

commit a8e8ce8602b688cdf411e372e1b7458c76344373
Author: teor 
Date:   Fri Dec 22 11:22:48 2017 +1100

Bump the dates and Tor versions on the sample torrcs
---
 src/config/torrc.minimal.in-staging | 2 +-
 src/config/torrc.sample.in  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/config/torrc.minimal.in-staging 
b/src/config/torrc.minimal.in-staging
index 223e559f1..4fede6dcf 100644
--- a/src/config/torrc.minimal.in-staging
+++ b/src/config/torrc.minimal.in-staging
@@ -1,5 +1,5 @@
 ## Configuration file for a typical Tor user
-## Last updated 22 September 2015 for Tor 0.2.7.3-alpha.
+## Last updated 22 December 2017 for Tor 0.3.2.8-rc.
 ## (may or may not work for much older or much newer versions of Tor.)
 ##
 ## Lines that begin with "## " try to explain what's going on. Lines
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 4728aff9b..865e9f660 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -1,5 +1,5 @@
 ## Configuration file for a typical Tor user
-## Last updated 22 September 2015 for Tor 0.2.7.3-alpha.
+## Last updated 22 December 2017 for Tor 0.3.2.8-rc.
 ## (may or may not work for much older or much newer versions of Tor.)
 ##
 ## Lines that begin with "## " try to explain what's going on. Lines



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

[tor-commits] [tor/maint-0.3.2] Clarify the OutboundBindAddressOR documentation in the sample torrc

2018-01-02 Thread nickm

commit d10c2d66686180f774ae946e7dc65070dd33cac1
Author: teor 
Date:   Fri Dec 22 11:22:10 2017 +1100

Clarify the OutboundBindAddressOR documentation in the sample torrc

Part of 22145
---
 src/config/torrc.sample.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 47e4ef9eb..4728aff9b 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -96,7 +96,8 @@
 ## If you have multiple network interfaces, you can specify one for
 ## outgoing traffic to use.
 ## OutboundBindAddressExit will be used for all exit traffic, while
-## OutboundBindAddressOR will be used for all other connections.
+## OutboundBindAddressOR will be used for all OR and Dir connections
+## (DNS connections ignore OutboundBindAddress).
 ## If you do not wish to differentiate, use OutboundBindAddress to
 ## specify the same address for both in a single line.
 #OutboundBindAddressExit 10.0.0.4



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

[tor-commits] [tor/maint-0.3.2] Document IPv6Exit in the sample torrcs

2018-01-02 Thread nickm

commit 5fb26ba2d8d96479a42b1ac286129351a0d09b92
Author: teor 
Date:   Fri Dec 22 11:10:30 2017 +1100

Document IPv6Exit in the sample torrcs

Sample config-only change.

Implements 24703.
---
 src/config/torrc.minimal.in-staging | 4 
 src/config/torrc.sample.in  | 8 
 2 files changed, 12 insertions(+)

diff --git a/src/config/torrc.minimal.in-staging 
b/src/config/torrc.minimal.in-staging
index c537c51f9..223e559f1 100644
--- a/src/config/torrc.minimal.in-staging
+++ b/src/config/torrc.minimal.in-staging
@@ -163,6 +163,10 @@
 ## break its concealability and potentially reveal its IP/TCP address.
 #MyFamily $keyid,$keyid,...
 
+## Uncomment this if you want your relay to allow IPv6 exit traffic.
+## (Relays only allow IPv4 exit traffic by default.)
+#IPv6Exit 1
+
 ## A comma-separated list of exit policies. They're considered first
 ## to last, and the first match wins.
 ##
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 8f3597f3f..47e4ef9eb 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -163,6 +163,14 @@
 ## break its concealability and potentially reveal its IP/TCP address.
 #MyFamily $keyid,$keyid,...
 
+## Uncomment this if you do *not* want your relay to allow any exit traffic.
+## (Relays allow exit traffic by default.)
+#ExitRelay 0
+
+## Uncomment this if you want your relay to allow IPv6 exit traffic.
+## (Relays only allow IPv4 exit traffic by default.)
+#IPv6Exit 1
+
 ## A comma-separated list of exit policies. They're considered first
 ## to last, and the first match wins.
 ##



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

[tor-commits] [tor/master] Clarify the OutboundBindAddressOR documentation in the sample torrc

2018-01-02 Thread nickm

commit d10c2d66686180f774ae946e7dc65070dd33cac1
Author: teor 
Date:   Fri Dec 22 11:22:10 2017 +1100

Clarify the OutboundBindAddressOR documentation in the sample torrc

Part of 22145
---
 src/config/torrc.sample.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 47e4ef9eb..4728aff9b 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -96,7 +96,8 @@
 ## If you have multiple network interfaces, you can specify one for
 ## outgoing traffic to use.
 ## OutboundBindAddressExit will be used for all exit traffic, while
-## OutboundBindAddressOR will be used for all other connections.
+## OutboundBindAddressOR will be used for all OR and Dir connections
+## (DNS connections ignore OutboundBindAddress).
 ## If you do not wish to differentiate, use OutboundBindAddress to
 ## specify the same address for both in a single line.
 #OutboundBindAddressExit 10.0.0.4



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

[tor-commits] [tor/release-0.3.2] Document IPv6Exit in the sample torrcs

2018-01-02 Thread nickm

commit 5fb26ba2d8d96479a42b1ac286129351a0d09b92
Author: teor 
Date:   Fri Dec 22 11:10:30 2017 +1100

Document IPv6Exit in the sample torrcs

Sample config-only change.

Implements 24703.
---
 src/config/torrc.minimal.in-staging | 4 
 src/config/torrc.sample.in  | 8 
 2 files changed, 12 insertions(+)

diff --git a/src/config/torrc.minimal.in-staging 
b/src/config/torrc.minimal.in-staging
index c537c51f9..223e559f1 100644
--- a/src/config/torrc.minimal.in-staging
+++ b/src/config/torrc.minimal.in-staging
@@ -163,6 +163,10 @@
 ## break its concealability and potentially reveal its IP/TCP address.
 #MyFamily $keyid,$keyid,...
 
+## Uncomment this if you want your relay to allow IPv6 exit traffic.
+## (Relays only allow IPv4 exit traffic by default.)
+#IPv6Exit 1
+
 ## A comma-separated list of exit policies. They're considered first
 ## to last, and the first match wins.
 ##
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 8f3597f3f..47e4ef9eb 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -163,6 +163,14 @@
 ## break its concealability and potentially reveal its IP/TCP address.
 #MyFamily $keyid,$keyid,...
 
+## Uncomment this if you do *not* want your relay to allow any exit traffic.
+## (Relays allow exit traffic by default.)
+#ExitRelay 0
+
+## Uncomment this if you want your relay to allow IPv6 exit traffic.
+## (Relays only allow IPv4 exit traffic by default.)
+#IPv6Exit 1
+
 ## A comma-separated list of exit policies. They're considered first
 ## to last, and the first match wins.
 ##



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

[tor-commits] [tor/release-0.3.2] Bump the dates and Tor versions on the sample torrcs

2018-01-02 Thread nickm

commit a8e8ce8602b688cdf411e372e1b7458c76344373
Author: teor 
Date:   Fri Dec 22 11:22:48 2017 +1100

Bump the dates and Tor versions on the sample torrcs
---
 src/config/torrc.minimal.in-staging | 2 +-
 src/config/torrc.sample.in  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/config/torrc.minimal.in-staging 
b/src/config/torrc.minimal.in-staging
index 223e559f1..4fede6dcf 100644
--- a/src/config/torrc.minimal.in-staging
+++ b/src/config/torrc.minimal.in-staging
@@ -1,5 +1,5 @@
 ## Configuration file for a typical Tor user
-## Last updated 22 September 2015 for Tor 0.2.7.3-alpha.
+## Last updated 22 December 2017 for Tor 0.3.2.8-rc.
 ## (may or may not work for much older or much newer versions of Tor.)
 ##
 ## Lines that begin with "## " try to explain what's going on. Lines
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 4728aff9b..865e9f660 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -1,5 +1,5 @@
 ## Configuration file for a typical Tor user
-## Last updated 22 September 2015 for Tor 0.2.7.3-alpha.
+## Last updated 22 December 2017 for Tor 0.3.2.8-rc.
 ## (may or may not work for much older or much newer versions of Tor.)
 ##
 ## Lines that begin with "## " try to explain what's going on. Lines



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

[tor-commits] [tor/master] Document IPv6Exit in the sample torrcs

2018-01-02 Thread nickm

commit 5fb26ba2d8d96479a42b1ac286129351a0d09b92
Author: teor 
Date:   Fri Dec 22 11:10:30 2017 +1100

Document IPv6Exit in the sample torrcs

Sample config-only change.

Implements 24703.
---
 src/config/torrc.minimal.in-staging | 4 
 src/config/torrc.sample.in  | 8 
 2 files changed, 12 insertions(+)

diff --git a/src/config/torrc.minimal.in-staging 
b/src/config/torrc.minimal.in-staging
index c537c51f9..223e559f1 100644
--- a/src/config/torrc.minimal.in-staging
+++ b/src/config/torrc.minimal.in-staging
@@ -163,6 +163,10 @@
 ## break its concealability and potentially reveal its IP/TCP address.
 #MyFamily $keyid,$keyid,...
 
+## Uncomment this if you want your relay to allow IPv6 exit traffic.
+## (Relays only allow IPv4 exit traffic by default.)
+#IPv6Exit 1
+
 ## A comma-separated list of exit policies. They're considered first
 ## to last, and the first match wins.
 ##
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 8f3597f3f..47e4ef9eb 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -163,6 +163,14 @@
 ## break its concealability and potentially reveal its IP/TCP address.
 #MyFamily $keyid,$keyid,...
 
+## Uncomment this if you do *not* want your relay to allow any exit traffic.
+## (Relays allow exit traffic by default.)
+#ExitRelay 0
+
+## Uncomment this if you want your relay to allow IPv6 exit traffic.
+## (Relays only allow IPv4 exit traffic by default.)
+#IPv6Exit 1
+
 ## A comma-separated list of exit policies. They're considered first
 ## to last, and the first match wins.
 ##



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

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug24703_032' into maint-0.3.2

2018-01-02 Thread nickm

commit 2aa1767b25e6b2b04892696c4c00e0257feb3812
Merge: 707076002 a8e8ce860
Author: Nick Mathewson 
Date:   Tue Jan 2 14:42:27 2018 -0500

Merge remote-tracking branch 'teor/bug24703_032' into maint-0.3.2

 src/config/torrc.minimal.in-staging |  6 +-
 src/config/torrc.sample.in  | 13 +++--
 2 files changed, 16 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/maint-0.3.2] Bump the dates and Tor versions on the sample torrcs

2018-01-02 Thread nickm

commit a8e8ce8602b688cdf411e372e1b7458c76344373
Author: teor 
Date:   Fri Dec 22 11:22:48 2017 +1100

Bump the dates and Tor versions on the sample torrcs
---
 src/config/torrc.minimal.in-staging | 2 +-
 src/config/torrc.sample.in  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/config/torrc.minimal.in-staging 
b/src/config/torrc.minimal.in-staging
index 223e559f1..4fede6dcf 100644
--- a/src/config/torrc.minimal.in-staging
+++ b/src/config/torrc.minimal.in-staging
@@ -1,5 +1,5 @@
 ## Configuration file for a typical Tor user
-## Last updated 22 September 2015 for Tor 0.2.7.3-alpha.
+## Last updated 22 December 2017 for Tor 0.3.2.8-rc.
 ## (may or may not work for much older or much newer versions of Tor.)
 ##
 ## Lines that begin with "## " try to explain what's going on. Lines
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 4728aff9b..865e9f660 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -1,5 +1,5 @@
 ## Configuration file for a typical Tor user
-## Last updated 22 September 2015 for Tor 0.2.7.3-alpha.
+## Last updated 22 December 2017 for Tor 0.3.2.8-rc.
 ## (may or may not work for much older or much newer versions of Tor.)
 ##
 ## Lines that begin with "## " try to explain what's going on. Lines



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

[tor-commits] [webwml/master] Bug 24697: Remove expired Mozilla matching text

2018-01-02 Thread hiro

commit 47a6ab07ff77aca59eb097f458003f233f93519a
Author: Arthur Edelstein 
Date:   Mon Jan 1 13:49:06 2018 -0500

Bug 24697: Remove expired Mozilla matching text
---
 css/donation-banner.css | 14 --
 include/head.wmi|  1 -
 2 files changed, 15 deletions(-)

diff --git a/css/donation-banner.css b/css/donation-banner.css
index 57c0af39..09b94e02 100644
--- a/css/donation-banner.css
+++ b/css/donation-banner.css
@@ -65,20 +65,6 @@
 top: 90px;
 white-space: nowrap;
 }
-#banner-mozilla {
-align-items: center;
-bottom: 5px;
-color: white;
-display: flex;
-font-size: 18px;
-font-family: sans-serif;
-left: 200px;
-position: absolute;
-right: 285px;
-text-align: start;
-top: 120px;
-white-space: nowrap;
-}
 #banner-donate-button {
 align-items: center;
 background-color: #13a513;
diff --git a/include/head.wmi b/include/head.wmi
index f496462f..0732bb7c 100644
--- a/include/head.wmi
+++ b/include/head.wmi
@@ -55,7 +55,6 @@
 
 Protecting the Privacy of 
Millions Every Day
 Tor: Powering Digital 
Resistance
-Give today and Mozilla will match 
your gift!
 https://www.torproject.org/donate/donate-pdr-hp;>
 



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

[tor-commits] [webwml/master] Merge branch 'master' into 24697

2018-01-02 Thread hiro

commit 5f57207af84078147438019516ca912c698404f7
Merge: 47a6ab07 509f2fd5
Author: hiromipaw 
Date:   Tue Jan 2 19:41:47 2018 +0100

Merge branch 'master' into 24697

 include/mirrors-table.wmi | 538 ++
 include/tor-mirrors.csv   | 185 
 2 files changed, 397 insertions(+), 326 deletions(-)

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

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

2018-01-02 Thread translation

commit 3f50707c1ec0cf788c67f5217088a8c52ada58f2
Author: Translation commit bot 
Date:   Tue Jan 2 17:15:58 2018 +

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

diff --git a/th/th.po b/th/th.po
index 19b52ee41..1db08126a 100644
--- a/th/th.po
+++ b/th/th.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-10 15:57+0100\n"
-"PO-Revision-Date: 2018-01-02 15:12+\n"
+"PO-Revision-Date: 2018-01-02 17:01+\n"
 "Last-Translator: bact' \n"
 "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n"
 "MIME-Version: 1.0\n"
@@ -364,7 +364,7 @@ msgstr ""
 
 #: ../tails_installer/gui.py:589
 msgid "An error happened while installing Tails"
-msgstr ""
+msgstr 
"à¹à¸à¸´à¸à¸à¹à¸à¸à¸´à¸à¸à¸¥à¸²à¸à¸£à¸°à¸«à¸§à¹à¸²à¸à¸à¸´à¸à¸à¸±à¹à¸
 Tails"
 
 #: ../tails_installer/gui.py:601
 msgid "Refreshing releases..."

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

[tor-commits] [compass/master] Redirect all queries to Relay Search

2018-01-02 Thread karsten

commit d66c8e97cad060f9f7479773b29f220ed49638d8
Author: Iain R. Learmonth 
Date:   Tue Nov 28 22:11:35 2017 +

Redirect all queries to Relay Search
---
 app.py  |  58 +---
 static/js/angularize.js |  86 ++--
 templates/index.html| 173 
 3 files changed, 65 insertions(+), 252 deletions(-)

diff --git a/app.py b/app.py
index 8c04292..a25955f 100644
--- a/app.py
+++ b/app.py
@@ -123,63 +123,7 @@ def index():
 
 @app.route('/result.json', methods=['GET'])
 def json_result():
-options = Opt(dict(request.args.items()))
-
-if "TESTING_DATAFILE" in app.config and "TESTING" in app.config:
-  stats = compass.RelayStats(options,app.config['TESTING_DATAFILE'])
-else:
-  stats = compass.RelayStats(options)
-
-results = stats.select_relays(stats.relays, options)
-
-relays = stats.sort_and_reduce(results,
-   options)
-
-return Response(json.dumps(relays, cls=ResultEncoder), 
mimetype='application/json')
-
-@app.route('/result', methods=['GET'])
-def result():
-options = Opt()
-sort_key = None
-relays = []
-
-for key, value in request.args.items():
-if key == "top":
-try:
-options.top = int(value)
-except:
-options.top = -1
-elif key == "sort":
-sort_key = value
-elif key in ["country", "ases"]:
-if value:
-setattr(options, key, [value])
-else:
-setattr(options, key, None)
-elif key == "exits":
-setattr(options, value, True)
-else:
-setattr(options, key, value)
-
-stats = compass.RelayStats(options)
-sorted_groups = stats.format_and_sort_groups(stats.relays,
-by_country=options.by_country,
-by_as_number=options.by_as,
-links=options.links)
-output_string = stats.print_groups(sorted_groups, options.top,
-   by_country=options.by_country,
-   by_as_number=options.by_as,
-   short=None,
-   links=None)
-results = parse(output_string, options.by_country or options.by_as, 
sort_key)
-if sort_key:
-for key in sorted(results.iterkeys(), reverse=True):
-for value in results[key]:
-relays.append(value)
-else:
-relays = results
-
-return render_template('result.html', results=relays, 
grouping=options.by_as or options.by_country)
+return jsonify({"error": "The Compass service has been partially shut 
down. See https://trac.torproject.org/projects/tor/ticket/24445."})
 
 if __name__ == '__main__':
 # Bind to PORT if defined, otherwise default to 5000.
diff --git a/static/js/angularize.js b/static/js/angularize.js
index 780e279..2fd04f5 100644
--- a/static/js/angularize.js
+++ b/static/js/angularize.js
@@ -11,11 +11,6 @@ compassModule.controller('CompassCtrl',function 
CompassCtrl($scope,$http,$locati
 
   $scope.state = "hidden"
   $scope.query = {
-exit_filter:"all_relays",
-links:true,
-sort:'cw',
-sort_reverse: true,
-country: null
   }
 
   /** Watch the location bar to allow us to load saved searches **/
@@ -26,59 +21,48 @@ compassModule.controller('CompassCtrl',function 
CompassCtrl($scope,$http,$locati
 }
   })
 
-  /** Make a sorting request
-   *
-   * Call 'success_cb' if the request is successful
-   */
-  $scope.ajax_sort = function(sortBy, invert, success_cb) {
-$scope.query.sort = sortBy
-$scope.query.sort_reverse = invert
-
-//Update the location bar to track sorting
-$location.search($scope.query)
-
-$http.get('result.json',{"params":$scope.query})
-  .success(function(data) {
-if (data.results.length > 0) {
-  $scope.data = data
-
-  if (success_cb !== null){
-success_cb()
-  }
-
-  $('body').animate({scrollTop:$("div#result_table").offset().top},500)
-}
-else {
-  $scope.state = "result_empty"
-}
-  })
-
-  }
-
   /**  Make a data request from the form
*
* Call 'success_cb' if the request is successful
*/
   $scope.request = function(success_cb) {
-$scope.state = 'loading'
+var rs_query = "";
+
+if ((typeof $scope.query["country"]) !== "undefined" && 
$scope.query["country"] !== "") {
+  rs_query += "country:" + $scope.query["country"] + " ";
+}
+if ((typeof $scope.query["ases"]) !== "undefined" && $scope.query["ases"] 
!== "") {
+  rs_query += "as:" + $scope.query["ases"] + " ";
+}
+if ((typeof $scope.query["family"]) !== "undefined" && 
$scope.query["family"] !== "") {
+  rs_query += "family:" + $scope.query["family"] + " ";
+}
+if ((typeof $scope.query["exits_only"]) !== "undefined" && 
$scope.query["exits_only"] == true)

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

2018-01-02 Thread translation

commit ecda4fefe52a05c106a53c9ea4d38d80adb87fa4
Author: Translation commit bot 
Date:   Tue Jan 2 15:15:54 2018 +

Update translations for liveusb-creator
---
 th/th.po | 56 
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/th/th.po b/th/th.po
index d4c76cb59..19b52ee41 100644
--- a/th/th.po
+++ b/th/th.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # bact' , 2013
-# bact' , 2017
+# bact' , 2017-2018
 # jiew , 2013
 # Manatsawin Hanmongkolchai , 2009
 # Somchai Sirisakdipol , 2013
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-10 15:57+0100\n"
-"PO-Revision-Date: 2017-12-27 05:02+\n"
+"PO-Revision-Date: 2018-01-02 15:12+\n"
 "Last-Translator: bact' \n"
 "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n"
 "MIME-Version: 1.0\n"
@@ -40,7 +40,7 @@ msgstr "à¹à¸à¸µà¸¢à¸à¹à¸à¸¢à¸±à¸à¸à¸¸à¸à¸à¸£à¸à¹ 
à¸ %(speed)d MB/sec
 
 #: ../tails_installer/creator.py:184
 msgid "Setting up OLPC boot file..."
-msgstr "à¸à¸³à¸¥à¸±à¸à¸à¸´à¸à¸à¸±à¹à¸à¹à¸à¸¥à¹à¸à¸¹à¸ OLPC"
+msgstr "à¸à¸³à¸¥à¸±à¸à¸à¸±à¹à¸à¸à¹à¸²à¹à¸à¹à¸¡à¸à¸¹à¸ OLPC..."
 
 #: ../tails_installer/creator.py:315
 #, python-format
@@ -127,7 +127,7 @@ msgstr "à¹à¸¡à¹à¸à¸£à¸²à¸à¸£à¸°à¸à¸à¹à¸à¹à¸¡ 
à¸à¸¸à¸à¸à¸£à¸à¹à¸
 #: ../tails_installer/creator.py:765 ../tails_installer/creator.py:977
 #, python-format
 msgid "Unsupported filesystem: %s"
-msgstr "à¸£à¸°à¸à¸à¹à¸à¸¥à¹à¹à¸¡à¹à¸ªà¸à¸±à¸à¸ªà¸à¸¸à¸: %s"
+msgstr "à¸£à¸°à¸à¸à¹à¸à¹à¸¡à¸à¸µà¹à¹à¸¡à¹à¸£à¸à¸à¸£à¸±à¸: %s"
 
 #: ../tails_installer/creator.py:782
 #, python-format
@@ -179,7 +179,7 @@ msgstr 
"à¸¥à¸à¸à¸à¸³à¸à¹à¸à¹à¸à¹à¸¡à¹à¸§à¹à¸²à¸à¸¢à¹à¸²à¸à¹à¸£à¸
 
 #: ../tails_installer/creator.py:971 ../tails_installer/creator.py:1364
 msgid "Verifying filesystem..."
-msgstr "à¸à¸³à¸¥à¸±à¸à¸à¸£à¸§à¸à¸ªà¸à¸à¸£à¸°à¸à¸à¹à¸à¸¥à¹..."
+msgstr "à¸à¸³à¸¥à¸±à¸à¸à¸£à¸§à¸à¸ªà¸à¸à¸£à¸°à¸à¸à¹à¸à¹à¸¡..."
 
 #: ../tails_installer/creator.py:995
 #, python-format
@@ -216,17 +216,17 @@ msgstr "à¸à¸à¸£à¹à¹à¸¡à¸ %(device)s à¹à¸à¹à¸ 
FAT32"
 
 #: ../tails_installer/creator.py:1249
 msgid "Could not find syslinux' gptmbr.bin"
-msgstr ""
+msgstr "à¹à¸¡à¹à¸à¸ gptmbr.bin à¸à¸à¸ syslinux"
 
 #: ../tails_installer/creator.py:1262
 #, python-format
 msgid "Reading extracted MBR from %s"
-msgstr ""
+msgstr "à¸à¸³à¸¥à¸±à¸à¸à¹à¸²à¸ MBR 
à¸à¸µà¹à¸à¸¹à¸à¸ªà¸à¸±à¸à¸à¸²à¸ %s"
 
 #: ../tails_installer/creator.py:1266
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
-msgstr ""
+msgstr "à¹à¸¡à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¸à¹à¸²à¸ MBR 
à¸à¸µà¹à¸à¸¹à¸à¸ªà¸à¸±à¸à¸à¸²à¸ %(path)s"
 
 #: ../tails_installer/creator.py:1279 ../tails_installer/creator.py:1280
 #, python-format
@@ -257,14 +257,14 @@ msgstr 
"à¹à¸¡à¹à¸à¸à¸à¸¸à¸à¸à¸£à¸à¹à¸à¸µà¹à¸£à¸à¸à¸£à¸±à¸"
 #: ../tails_installer/creator.py:1368
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
-msgstr 
"à¹à¸à¸£à¸à¸à¸£à¸§à¸à¸ªà¸à¸à¹à¸«à¹à¹à¸à¹à¹à¸à¸§à¹à¸²à¹à¸à¹à¹à¸ªà¸µà¸¢à¸
 USB key 
à¹à¸¥à¹à¸§à¹à¸¥à¸°à¸à¸¹à¸à¸à¸à¸£à¹à¹à¸¡à¸à¸à¹à¸§à¸¢à¸£à¸°à¸à¸à¹à¸à¸¥à¹
 FAT"
+msgstr "à¹à¸à¸£à¸à¸à¸£à¸§à¸à¸ªà¸à¸à¹à¸«à¹à¹à¸à¹à¹à¸à¸§à¹à¸² USB 
key 
à¹à¸ªà¸µà¸¢à¸à¸à¸¢à¸¹à¹à¹à¸¥à¸°à¸¡à¸±à¸à¸à¸¹à¸à¸à¸à¸£à¹à¹à¸¡à¸à¸à¹à¸§à¸¢à¸£à¸°à¸à¸à¹à¸à¹à¸¡à¹à¸à¸
 FAT"
 
 #: ../tails_installer/creator.py:1371
 #, python-format
 msgid ""
 "Unsupported filesystem: %s\n"
 "Please backup and format your USB key with the FAT filesystem."
-msgstr "à¸£à¸°à¸à¸à¹à¸à¸¥à¹à¹à¸¡à¹à¸ªà¸à¸±à¸à¸ªà¸à¸¸à¸: 
%s\nà¹à¸à¸£à¸à¸ªà¸³à¸£à¸à¸à¸à¹à¸à¸¡à¸¹à¸¥à¹à¸¥à¸°à¸à¸à¸£à¹à¹à¸¡à¸ 
USB key à¸à¹à¸§à¸¢à¸£à¸°à¸à¸à¹à¸à¸¥à¹à¹à¸à¸ FAT"
+msgstr "à¸£à¸°à¸à¸à¹à¸à¹à¸¡à¸à¸µà¹à¹à¸¡à¹à¸£à¸à¸à¸£à¸±à¸: 
%s\nà¹à¸à¸£à¸à¸ªà¸³à¸£à¸à¸à¸à¹à¸à¸¡à¸¹à¸¥à¹à¸¥à¸°à¸à¸à¸£à¹à¹à¸¡à¸ 
USB key à¸à¹à¸§à¸¢à¸£à¸°à¸à¸à¹à¸à¸¥à¹à¹à¸à¸ FAT"
 
 #: ../tails_installer/creator.py:1438
 msgid ""
@@ -304,7 +304,7 @@ msgstr 
"à¸à¸²à¸£à¸à¸´à¸à¸à¸±à¹à¸à¹à¸ªà¸£à¹à¸à¸ªà¸´à¹à¸! (%s)"
 
 #: ../tails_installer/gui.py:263
 msgid "Tails installation failed!"
-msgstr ""
+msgstr "à¸à¸²à¸£à¸à¸´à¸à¸à¸±à¹à¸ Tails à¸¥à¹à¸¡à¹à¸«à¸¥à¸§!"
 
 #: ../tails_installer/gui.py:363
 msgid ""
@@ -315,32 +315,32 @@ msgstr "à¸à¸³à¹à¸à¸·à¸à¸: 
à¹à¸à¸£à¸·à¹à¸à¸à¸¡à¸·à¸à¸à¸µà¹à¸à¸³à¹
 
 #: ../tails_installer/gui.py:375
 msgid "Tails Installer"
-msgstr ""
+msgstr "à¸à¸±à¸§à¸à¸´à¸à¸à¸±à¹à¸ Tails"
 
 #: ../tails_installer/gui.py:456
 msgid "Upgrade"
-msgstr ""
+msgstr "à¸à¸£à¸±à¸à¸£à¸¸à¹à¸"
 
 #:

[tor-commits] [tor/release-0.3.1] Clear the address when we can't choose a reachable address

2018-01-02 Thread nickm

commit 09b9a35c07a35c0891f8cb10406c113155740d18
Author: teor 
Date:   Mon Dec 25 01:53:14 2017 +1100

Clear the address when we can't choose a reachable address

When the fascist_firewall_choose_address_ functions don't find a
reachable address, set the returned address to the null address and port.

This is a precautionary measure, because some callers do not check the
return value.

Fixes bug 24736; bugfix on 0.2.8.2-alpha.
---
 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/changes/bug24736 b/changes/bug24736
new file mode 100644
index 0..632560932
--- /dev/null
+++ b/changes/bug24736
@@ -0,0 +1,6 @@
+  o Minor bugfixes (address selection):
+- When the fascist_firewall_choose_address_ functions don't find a
+  reachable address, set the returned address to the null address and port.
+  This is a precautionary measure, because some callers do not check the
+  return value.
+  Fixes bug 24736; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/policies.c b/src/or/policies.c
index 50fec3a77..f09a70899 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -860,6 +860,8 @@ fascist_firewall_choose_address_base(const tor_addr_t 
*ipv4_addr,
 ap->port = result->port;
 return 1;
   } else {
+tor_addr_make_null(>addr, AF_UNSPEC);
+ap->port = 0;
 return 0;
   }
 }



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

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

2018-01-02 Thread nickm

commit fb5877b9721dcc0d140c2c7c8d16d0b656bbf5d7
Merge: 08469a338 8a7767603
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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

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

2018-01-02 Thread nickm

commit 707076002d4db2b8b2e6f05bea86316674bf9f45
Merge: 94c59851d fb5877b97
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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

[tor-commits] [tor/release-0.3.1] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

2018-01-02 Thread nickm

commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3
Merge: 79a50afa0 09b9a35c0
Author: Nick Mathewson 
Date:   Tue Jan 2 10:09:44 2018 -0500

Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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

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

2018-01-02 Thread nickm

commit fd46d8d0ad9e976cdae7676e9f27f572b78ac959
Merge: 11336cfa0 707076002
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)

___
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

2018-01-02 Thread nickm

commit 698e4a4780a717083e713ee0cf1f3a744f7087d7
Merge: bcf033047 8a7767603
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)

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

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

2018-01-02 Thread nickm

commit 8a7767603a9ac826f39505fc9ea8c08385f6dfd6
Merge: 03b4dd92a 6e5e4f92a
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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

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

2018-01-02 Thread nickm

commit 8a7767603a9ac826f39505fc9ea8c08385f6dfd6
Merge: 03b4dd92a 6e5e4f92a
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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

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

2018-01-02 Thread nickm

commit fb5877b9721dcc0d140c2c7c8d16d0b656bbf5d7
Merge: 08469a338 8a7767603
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

2018-01-02 Thread nickm

commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3
Merge: 79a50afa0 09b9a35c0
Author: Nick Mathewson 
Date:   Tue Jan 2 10:09:44 2018 -0500

Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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

[tor-commits] [tor/release-0.3.2] Clear the address when we can't choose a reachable address

2018-01-02 Thread nickm

commit 09b9a35c07a35c0891f8cb10406c113155740d18
Author: teor 
Date:   Mon Dec 25 01:53:14 2017 +1100

Clear the address when we can't choose a reachable address

When the fascist_firewall_choose_address_ functions don't find a
reachable address, set the returned address to the null address and port.

This is a precautionary measure, because some callers do not check the
return value.

Fixes bug 24736; bugfix on 0.2.8.2-alpha.
---
 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/changes/bug24736 b/changes/bug24736
new file mode 100644
index 0..632560932
--- /dev/null
+++ b/changes/bug24736
@@ -0,0 +1,6 @@
+  o Minor bugfixes (address selection):
+- When the fascist_firewall_choose_address_ functions don't find a
+  reachable address, set the returned address to the null address and port.
+  This is a precautionary measure, because some callers do not check the
+  return value.
+  Fixes bug 24736; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/policies.c b/src/or/policies.c
index 50fec3a77..f09a70899 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -860,6 +860,8 @@ fascist_firewall_choose_address_base(const tor_addr_t 
*ipv4_addr,
 ap->port = result->port;
 return 1;
   } else {
+tor_addr_make_null(>addr, AF_UNSPEC);
+ap->port = 0;
 return 0;
   }
 }



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

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

2018-01-02 Thread nickm

commit a8a060cdb329eff865928da5a5e19fa4f6cba021
Merge: 45b1c6bc8 fb5877b97
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)

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

2018-01-02 Thread nickm

commit 8a7767603a9ac826f39505fc9ea8c08385f6dfd6
Merge: 03b4dd92a 6e5e4f92a
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




___
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] Clear the address when we can't choose a reachable address

2018-01-02 Thread nickm

commit 09b9a35c07a35c0891f8cb10406c113155740d18
Author: teor 
Date:   Mon Dec 25 01:53:14 2017 +1100

Clear the address when we can't choose a reachable address

When the fascist_firewall_choose_address_ functions don't find a
reachable address, set the returned address to the null address and port.

This is a precautionary measure, because some callers do not check the
return value.

Fixes bug 24736; bugfix on 0.2.8.2-alpha.
---
 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/changes/bug24736 b/changes/bug24736
new file mode 100644
index 0..632560932
--- /dev/null
+++ b/changes/bug24736
@@ -0,0 +1,6 @@
+  o Minor bugfixes (address selection):
+- When the fascist_firewall_choose_address_ functions don't find a
+  reachable address, set the returned address to the null address and port.
+  This is a precautionary measure, because some callers do not check the
+  return value.
+  Fixes bug 24736; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/policies.c b/src/or/policies.c
index 50fec3a77..f09a70899 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -860,6 +860,8 @@ fascist_firewall_choose_address_base(const tor_addr_t 
*ipv4_addr,
 ap->port = result->port;
 return 1;
   } else {
+tor_addr_make_null(>addr, AF_UNSPEC);
+ap->port = 0;
 return 0;
   }
 }



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

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

2018-01-02 Thread nickm

commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3
Merge: 79a50afa0 09b9a35c0
Author: Nick Mathewson 
Date:   Tue Jan 2 10:09:44 2018 -0500

Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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

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

2018-01-02 Thread nickm

commit b2871cef91fbabd1dccdd8a424d5921948ab9d22
Merge: cbe36a739 6e5e4f92a
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)

___
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 remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

2018-01-02 Thread nickm

commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3
Merge: 79a50afa0 09b9a35c0
Author: Nick Mathewson 
Date:   Tue Jan 2 10:09:44 2018 -0500

Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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

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

2018-01-02 Thread nickm

commit 707076002d4db2b8b2e6f05bea86316674bf9f45
Merge: 94c59851d fb5877b97
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)

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

[tor-commits] [tor/release-0.2.9] Clear the address when we can't choose a reachable address

2018-01-02 Thread nickm

commit 09b9a35c07a35c0891f8cb10406c113155740d18
Author: teor 
Date:   Mon Dec 25 01:53:14 2017 +1100

Clear the address when we can't choose a reachable address

When the fascist_firewall_choose_address_ functions don't find a
reachable address, set the returned address to the null address and port.

This is a precautionary measure, because some callers do not check the
return value.

Fixes bug 24736; bugfix on 0.2.8.2-alpha.
---
 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/changes/bug24736 b/changes/bug24736
new file mode 100644
index 0..632560932
--- /dev/null
+++ b/changes/bug24736
@@ -0,0 +1,6 @@
+  o Minor bugfixes (address selection):
+- When the fascist_firewall_choose_address_ functions don't find a
+  reachable address, set the returned address to the null address and port.
+  This is a precautionary measure, because some callers do not check the
+  return value.
+  Fixes bug 24736; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/policies.c b/src/or/policies.c
index 50fec3a77..f09a70899 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -860,6 +860,8 @@ fascist_firewall_choose_address_base(const tor_addr_t 
*ipv4_addr,
 ap->port = result->port;
 return 1;
   } else {
+tor_addr_make_null(>addr, AF_UNSPEC);
+ap->port = 0;
 return 0;
   }
 }



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

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

2018-01-02 Thread nickm

commit bc5ef83f8f960e9ccf0e8634301037e61d43f332
Merge: d53f77985 707076002
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.3.2'

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)

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

2018-01-02 Thread nickm

commit 8a7767603a9ac826f39505fc9ea8c08385f6dfd6
Merge: 03b4dd92a 6e5e4f92a
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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

[tor-commits] [tor/release-0.2.9] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

2018-01-02 Thread nickm

commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3
Merge: 79a50afa0 09b9a35c0
Author: Nick Mathewson 
Date:   Tue Jan 2 10:09:44 2018 -0500

Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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

[tor-commits] [tor/master] Clear the address when we can't choose a reachable address

2018-01-02 Thread nickm

commit 09b9a35c07a35c0891f8cb10406c113155740d18
Author: teor 
Date:   Mon Dec 25 01:53:14 2017 +1100

Clear the address when we can't choose a reachable address

When the fascist_firewall_choose_address_ functions don't find a
reachable address, set the returned address to the null address and port.

This is a precautionary measure, because some callers do not check the
return value.

Fixes bug 24736; bugfix on 0.2.8.2-alpha.
---
 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/changes/bug24736 b/changes/bug24736
new file mode 100644
index 0..632560932
--- /dev/null
+++ b/changes/bug24736
@@ -0,0 +1,6 @@
+  o Minor bugfixes (address selection):
+- When the fascist_firewall_choose_address_ functions don't find a
+  reachable address, set the returned address to the null address and port.
+  This is a precautionary measure, because some callers do not check the
+  return value.
+  Fixes bug 24736; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/policies.c b/src/or/policies.c
index 50fec3a77..f09a70899 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -860,6 +860,8 @@ fascist_firewall_choose_address_base(const tor_addr_t 
*ipv4_addr,
 ap->port = result->port;
 return 1;
   } else {
+tor_addr_make_null(>addr, AF_UNSPEC);
+ap->port = 0;
 return 0;
   }
 }



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

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

2018-01-02 Thread nickm

commit 707076002d4db2b8b2e6f05bea86316674bf9f45
Merge: 94c59851d fb5877b97
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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

[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

2018-01-02 Thread nickm

commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3
Merge: 79a50afa0 09b9a35c0
Author: Nick Mathewson 
Date:   Tue Jan 2 10:09:44 2018 -0500

Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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

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

2018-01-02 Thread nickm

commit 8a7767603a9ac826f39505fc9ea8c08385f6dfd6
Merge: 03b4dd92a 6e5e4f92a
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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

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

2018-01-02 Thread nickm

commit fb5877b9721dcc0d140c2c7c8d16d0b656bbf5d7
Merge: 08469a338 8a7767603
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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

2018-01-02 Thread nickm

commit fb5877b9721dcc0d140c2c7c8d16d0b656bbf5d7
Merge: 08469a338 8a7767603
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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

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

2018-01-02 Thread nickm

commit fb5877b9721dcc0d140c2c7c8d16d0b656bbf5d7
Merge: 08469a338 8a7767603
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)

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

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

2018-01-02 Thread nickm

commit 8a7767603a9ac826f39505fc9ea8c08385f6dfd6
Merge: 03b4dd92a 6e5e4f92a
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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

2018-01-02 Thread nickm

commit 8a7767603a9ac826f39505fc9ea8c08385f6dfd6
Merge: 03b4dd92a 6e5e4f92a
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)

___
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 remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

2018-01-02 Thread nickm

commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3
Merge: 79a50afa0 09b9a35c0
Author: Nick Mathewson 
Date:   Tue Jan 2 10:09:44 2018 -0500

Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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

[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

2018-01-02 Thread nickm

commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3
Merge: 79a50afa0 09b9a35c0
Author: Nick Mathewson 
Date:   Tue Jan 2 10:09:44 2018 -0500

Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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

[tor-commits] [tor/maint-0.2.9] Clear the address when we can't choose a reachable address

2018-01-02 Thread nickm

commit 09b9a35c07a35c0891f8cb10406c113155740d18
Author: teor 
Date:   Mon Dec 25 01:53:14 2017 +1100

Clear the address when we can't choose a reachable address

When the fascist_firewall_choose_address_ functions don't find a
reachable address, set the returned address to the null address and port.

This is a precautionary measure, because some callers do not check the
return value.

Fixes bug 24736; bugfix on 0.2.8.2-alpha.
---
 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/changes/bug24736 b/changes/bug24736
new file mode 100644
index 0..632560932
--- /dev/null
+++ b/changes/bug24736
@@ -0,0 +1,6 @@
+  o Minor bugfixes (address selection):
+- When the fascist_firewall_choose_address_ functions don't find a
+  reachable address, set the returned address to the null address and port.
+  This is a precautionary measure, because some callers do not check the
+  return value.
+  Fixes bug 24736; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/policies.c b/src/or/policies.c
index 50fec3a77..f09a70899 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -860,6 +860,8 @@ fascist_firewall_choose_address_base(const tor_addr_t 
*ipv4_addr,
 ap->port = result->port;
 return 1;
   } else {
+tor_addr_make_null(>addr, AF_UNSPEC);
+ap->port = 0;
 return 0;
   }
 }



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

[tor-commits] [tor/maint-0.2.9] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

2018-01-02 Thread nickm

commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3
Merge: 79a50afa0 09b9a35c0
Author: Nick Mathewson 
Date:   Tue Jan 2 10:09:44 2018 -0500

Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)

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

[tor-commits] [tor/maint-0.3.1] Clear the address when we can't choose a reachable address

2018-01-02 Thread nickm

commit 09b9a35c07a35c0891f8cb10406c113155740d18
Author: teor 
Date:   Mon Dec 25 01:53:14 2017 +1100

Clear the address when we can't choose a reachable address

When the fascist_firewall_choose_address_ functions don't find a
reachable address, set the returned address to the null address and port.

This is a precautionary measure, because some callers do not check the
return value.

Fixes bug 24736; bugfix on 0.2.8.2-alpha.
---
 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/changes/bug24736 b/changes/bug24736
new file mode 100644
index 0..632560932
--- /dev/null
+++ b/changes/bug24736
@@ -0,0 +1,6 @@
+  o Minor bugfixes (address selection):
+- When the fascist_firewall_choose_address_ functions don't find a
+  reachable address, set the returned address to the null address and port.
+  This is a precautionary measure, because some callers do not check the
+  return value.
+  Fixes bug 24736; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/policies.c b/src/or/policies.c
index 50fec3a77..f09a70899 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -860,6 +860,8 @@ fascist_firewall_choose_address_base(const tor_addr_t 
*ipv4_addr,
 ap->port = result->port;
 return 1;
   } else {
+tor_addr_make_null(>addr, AF_UNSPEC);
+ap->port = 0;
 return 0;
   }
 }



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

[tor-commits] [tor/maint-0.3.2] Clear the address when we can't choose a reachable address

2018-01-02 Thread nickm

commit 09b9a35c07a35c0891f8cb10406c113155740d18
Author: teor 
Date:   Mon Dec 25 01:53:14 2017 +1100

Clear the address when we can't choose a reachable address

When the fascist_firewall_choose_address_ functions don't find a
reachable address, set the returned address to the null address and port.

This is a precautionary measure, because some callers do not check the
return value.

Fixes bug 24736; bugfix on 0.2.8.2-alpha.
---
 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/changes/bug24736 b/changes/bug24736
new file mode 100644
index 0..632560932
--- /dev/null
+++ b/changes/bug24736
@@ -0,0 +1,6 @@
+  o Minor bugfixes (address selection):
+- When the fascist_firewall_choose_address_ functions don't find a
+  reachable address, set the returned address to the null address and port.
+  This is a precautionary measure, because some callers do not check the
+  return value.
+  Fixes bug 24736; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/policies.c b/src/or/policies.c
index 50fec3a77..f09a70899 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -860,6 +860,8 @@ fascist_firewall_choose_address_base(const tor_addr_t 
*ipv4_addr,
 ap->port = result->port;
 return 1;
   } else {
+tor_addr_make_null(>addr, AF_UNSPEC);
+ap->port = 0;
 return 0;
   }
 }



___
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] Clear the address when we can't choose a reachable address

2018-01-02 Thread nickm

commit 09b9a35c07a35c0891f8cb10406c113155740d18
Author: teor 
Date:   Mon Dec 25 01:53:14 2017 +1100

Clear the address when we can't choose a reachable address

When the fascist_firewall_choose_address_ functions don't find a
reachable address, set the returned address to the null address and port.

This is a precautionary measure, because some callers do not check the
return value.

Fixes bug 24736; bugfix on 0.2.8.2-alpha.
---
 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/changes/bug24736 b/changes/bug24736
new file mode 100644
index 0..632560932
--- /dev/null
+++ b/changes/bug24736
@@ -0,0 +1,6 @@
+  o Minor bugfixes (address selection):
+- When the fascist_firewall_choose_address_ functions don't find a
+  reachable address, set the returned address to the null address and port.
+  This is a precautionary measure, because some callers do not check the
+  return value.
+  Fixes bug 24736; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/policies.c b/src/or/policies.c
index 50fec3a77..f09a70899 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -860,6 +860,8 @@ fascist_firewall_choose_address_base(const tor_addr_t 
*ipv4_addr,
 ap->port = result->port;
 return 1;
   } else {
+tor_addr_make_null(>addr, AF_UNSPEC);
+ap->port = 0;
 return 0;
   }
 }



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

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/ticket24001'

2018-01-02 Thread nickm

commit d53f779853ee112ca152198f7695ac3b940719ae
Merge: 996328f37 53f350182
Author: Nick Mathewson 
Date:   Tue Jan 2 10:07:13 2018 -0500

Merge remote-tracking branch 'teor/ticket24001'

 changes/ticket24001 | 4 
 src/or/nodelist.c   | 7 +++
 2 files changed, 11 insertions(+)

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

[tor-commits] [tor/master] Expand comments in node_get_ed25519_id() and put them near the relevant code

2018-01-02 Thread nickm

commit 53f350182e60b32791b23ea98368a41037bffd0d
Author: teor 
Date:   Sun Dec 24 19:47:42 2017 +1100

Expand comments in node_get_ed25519_id() and put them near the relevant code

And add a changes file.

Follow-up to 24001.
---
 changes/ticket24001 | 4 
 src/or/nodelist.c   | 6 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/changes/ticket24001 b/changes/ticket24001
new file mode 100644
index 0..4701a38ed
--- /dev/null
+++ b/changes/ticket24001
@@ -0,0 +1,4 @@
+  o Minor features (code correctness, descriptors):
+- Check that microdesc ed25519 ids are non-zero in node_get_ed25519_id(),
+  before returning them.
+  Implements 24001, patch by "aruna1234".
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 042074998..4eafe6d7a 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -908,18 +908,22 @@ node_get_ed25519_id(const node_t *node)
 {
   const ed25519_public_key_t *ri_pk = NULL;
   const ed25519_public_key_t *md_pk = NULL;
+
   if (node->ri) {
 if (node->ri->cache_info.signing_key_cert) {
   ri_pk = >ri->cache_info.signing_key_cert->signing_key;
+  /* Checking whether routerinfo ed25519 is all zero.
+   * Our descriptor parser should make sure this never happens. */
   if (BUG(ed25519_public_key_is_zero(ri_pk)))
 ri_pk = NULL;
 }
   }
 
-/* Checking whether microdesc_ed25519() is all zero*/
   if (node->md) {
 if (node->md->ed25519_identity_pkey) {
   md_pk = node->md->ed25519_identity_pkey;
+  /* Checking whether microdesc ed25519 is all zero.
+   * Our descriptor parser should make sure this never happens. */
   if (BUG(ed25519_public_key_is_zero(md_pk)))
 md_pk = NULL;
 }



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

[tor-commits] [tor/master] Conditional check added

2018-01-02 Thread nickm

commit 5865e56ec083bbccd46bf71a9343b3744f0c4ecc
Author: ArunaMaurya221B 
Date:   Fri Dec 22 16:15:42 2017 +0530

Conditional check added
---
 src/or/nodelist.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index e6eaefb21..042074998 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -916,9 +916,12 @@ node_get_ed25519_id(const node_t *node)
 }
   }
 
+/* Checking whether microdesc_ed25519() is all zero*/
   if (node->md) {
 if (node->md->ed25519_identity_pkey) {
   md_pk = node->md->ed25519_identity_pkey;
+  if (BUG(ed25519_public_key_is_zero(md_pk)))
+md_pk = NULL;
 }
   }
 



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

[tor-commits] [tor/master] Stop trying to remove NULL filenames on shutdown

2018-01-02 Thread nickm

commit d99ccf090f5c5cb4ca76524a73c6fd7543fe969e
Author: teor 
Date:   Fri Dec 29 23:00:57 2017 +1100

Stop trying to remove NULL filenames on shutdown

Fixes bug 24762; bugfix on master.
(Not in any released version of Tor.)
---
 changes/bug24762 | 3 +++
 src/or/main.c| 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/bug24762 b/changes/bug24762
new file mode 100644
index 0..e9d3badaa
--- /dev/null
+++ b/changes/bug24762
@@ -0,0 +1,3 @@
+  o Minor bugfixes (shutdown, file handling):
+- Stop trying to remove NULL filenames on shutdown.
+  Fixes bug 24762; bugfix on master.
diff --git a/src/or/main.c b/src/or/main.c
index e449b95b9..9e51e35bc 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -3480,12 +3480,12 @@ tor_free_all(int postfork)
 
 /**
  * Remove the specified file, and log a warning if the operation fails for
- * any reason other than the file not existing.
+ * any reason other than the file not existing. Ignores NULL filenames.
  */
 void
 tor_remove_file(const char *filename)
 {
-  if (tor_unlink(filename) != 0 && errno != ENOENT) {
+  if (filename && tor_unlink(filename) != 0 && errno != ENOENT) {
 log_warn(LD_FS, "Couldn't unlink %s: %s",
filename, strerror(errno));
   }



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

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug24762'

2018-01-02 Thread nickm

commit 2819e9467e229c2469b6fb0fd584f5cf020ffd3e
Merge: 5051cfe9b d99ccf090
Author: Nick Mathewson 
Date:   Tue Jan 2 09:54:56 2018 -0500

Merge remote-tracking branch 'teor/bug24762'

 changes/bug24762 | 3 +++
 src/or/main.c| 4 ++--
 2 files changed, 5 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] Remove changes file for 24762

2018-01-02 Thread nickm

commit 996328f374cb3f3b9820278b7e76ba1ee40dbfed
Author: Nick Mathewson 
Date:   Tue Jan 2 09:55:29 2018 -0500

Remove changes file for 24762

(Bugfixes for bugs not in any released Tor don't get listed in the
changelog, and therefore don't need changes files.)
---
 changes/bug24762 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/changes/bug24762 b/changes/bug24762
deleted file mode 100644
index e9d3badaa..0
--- a/changes/bug24762
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (shutdown, file handling):
-- Stop trying to remove NULL filenames on shutdown.
-  Fixes bug 24762; bugfix on master.

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

[tor-commits] [tor/master] Merge remote-tracking branch 'ffmancera/github/bug24677'

2018-01-02 Thread nickm

commit 5051cfe9bd66aa68c6825c00e107f759c921a9ff
Merge: f5d89fab2 3871c102a
Author: Nick Mathewson 
Date:   Tue Jan 2 09:37:23 2018 -0500

Merge remote-tracking branch 'ffmancera/github/bug24677'

 Makefile.am | 10 ++
 changes/ticket24677 |  4 
 2 files changed, 10 insertions(+), 4 deletions(-)

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

[tor-commits] [tor/master] Use ping -6 ::1 on Linux when ping6 ::1 fails on tests.

2018-01-02 Thread nickm

commit 3871c102a6345484c5c49c91d324885bfde2e242
Author: Fernando Fernandez Mancera 
Date:   Tue Jan 2 15:18:36 2018 +0100

Use ping -6 ::1 on Linux when ping6 ::1 fails on tests.

Tor test now checks if "ping -6 -c 1 -W 1 ::1" works when "ping6 -c 1 -W 1 
::1"
fails on tests.

Fixes #24677; bugfix in 0.2.9.3-alpha.

Signed-off-by: Fernando Fernandez Mancera 
---
 Makefile.am | 10 ++
 changes/ticket24677 |  4 
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ad2ceb66a..e92417cda 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -117,17 +117,19 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
 
 # Run all available tests using automake's test-driver
 # only run IPv6 tests if we can ping6 ::1 (localhost)
+# only run IPv6 tests if we can ping ::1 (localhost)
 # some IPv6 tests will fail without an IPv6 DNS server (see #16971 and #17011)
 # only run mixed tests if we have a tor-stable binary
-# Try both the BSD and the Linux ping6 syntax, because they're incompatible
+# Try the syntax for BSD ping6, Linux ping6, and Linux ping -6,
+# because they're incompatible
 test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
-   if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1; then \
-   echo "ping6 ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
+   if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1 || ping -6 -c 1 -W 1 ::1 >/dev/null 2>&1; then \
+   echo "ping6 ::1 or ping ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
else \
-   echo "ping6 ::1 failed, skipping IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
+   echo "ping6 ::1 and ping ::1 failed, skipping IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
skip_flavors="$$skip_flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
fi; \
if command -v tor-stable >/dev/null 2>&1; then \
diff --git a/changes/ticket24677 b/changes/ticket24677
new file mode 100644
index 0..5e6d55186
--- /dev/null
+++ b/changes/ticket24677
@@ -0,0 +1,4 @@
+  o Minor bugfix (network IPv6 test):
+- Tor test now checks if "ping -6 ::1" works when the user runs "make
+  test-network-all". Fixes bug 24677; bugfix on 0.2.9.3-alpha.
+  Patch by "ffmancera".



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

[tor-commits] [torspec/master] reindex

2018-01-02 Thread nickm

commit a76eaa606b611a088739c0bb2557996a48c5f161
Author: Nick Mathewson 
Date:   Tue Jan 2 09:30:01 2018 -0500

reindex
---
 proposals/000-index.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index 22e3fec..6c6ae09 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -203,7 +203,7 @@ Proposals by number:
 280  Privacy-Preserving Statistics with Privcount in Tor [SUPERSEDED]
 281  Downloading microdescriptors in bulk [DRAFT]
 282  Remove "Named" and "Unnamed" handling from consensus voting [OPEN]
-283  Move IPv6 ORPorts from microdescriptors to the microdesc consensus [OPEN]
+283  Move IPv6 ORPorts from microdescriptors to the microdesc consensus 
[ACCEPTED]
 284  Hidden Service v3 Control Port [FINISHED]
 285  Directory documents should be standardized as UTF-8 [OPEN]
 286  Controller APIs for hibernation access on mobile [OPEN]
@@ -265,7 +265,6 @@ Proposals by status:
276  Report bandwidth with lower granularity in consensus documents [for 
0.3.1.x-alpha]
277  Detect multiple relay instances running with same ID [for 0.3.??]
282  Remove "Named" and "Unnamed" handling from consensus voting [for 
0.3.3.x]
-   283  Move IPv6 ORPorts from microdescriptors to the microdesc consensus 
[for 0.3.3.x]
285  Directory documents should be standardized as UTF-8
286  Controller APIs for hibernation access on mobile
287  Reduce circuit lifetime without overloading the network
@@ -275,6 +274,7 @@ Proposals by status:
188  Bridge Guards and other anti-enumeration defenses
258  Denial-of-service resistance for directory authorities
265  Load Balancing with Overhead Parameters [for 0.2.9.x]
+   283  Move IPv6 ORPorts from microdescriptors to the microdesc consensus 
[for 0.3.3.x] [in 0.3.3.1-alpha]
  META:
000  Index of Tor Proposals
001  The Tor Proposal Process

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

[tor-commits] [torspec/master] Update prop#283's Status to Accepted, and add Implemented-In and Ticket

2018-01-02 Thread nickm

commit 6ac960d4511df3622ec5196601f8d6f436799009
Author: teor 
Date:   Tue Jan 2 13:07:27 2018 +1100

Update prop#283's Status to Accepted, and add Implemented-In and Ticket

The code that implements prop#283 has been merged to master
(0.3.3.0-alpha-dev).

There is a small amount of cleanup code in #23975 and #24573 that still
needs to be merged. It addresses some correctness and efficiency issues.

Closes #24778.
---
 proposals/283-ipv6-in-micro-consensus.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/proposals/283-ipv6-in-micro-consensus.txt 
b/proposals/283-ipv6-in-micro-consensus.txt
index da12cfa..65e2922 100644
--- a/proposals/283-ipv6-in-micro-consensus.txt
+++ b/proposals/283-ipv6-in-micro-consensus.txt
@@ -2,8 +2,10 @@ Filename: 283-ipv6-in-micro-consensus.txt
 Title: Move IPv6 ORPorts from microdescriptors to the microdesc consensus
 Author: Tim Wilson-Brown (teor), Nick Mathewson
 Created: 18-Oct-2017
-Status: Open
+Status: Accepted
 Target: 0.3.3.x
+Implemented-In: 0.3.3.1-alpha
+Ticket: #20916
 
 1. Summary
 



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

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2018-01-02 Thread translation

commit 4b95e3184e9ea1c8b8e60637e1035d8239a1
Author: Translation commit bot 
Date:   Tue Jan 2 10:46:55 2018 +

Update translations for tor-launcher-network-settings
---
 sv/network-settings.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sv/network-settings.dtd b/sv/network-settings.dtd
index d15813496..927532c2f 100644
--- a/sv/network-settings.dtd
+++ b/sv/network-settings.dtd
@@ -42,7 +42,7 @@
 
 
 
-
+
 
 
 
@@ -50,8 +50,8 @@
 
 
 
-
-
+
+
 
 
 

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

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2018-01-02 Thread translation

commit d8e0254ab23126187da78a29e5f1c98f3598b6e4
Author: Translation commit bot 
Date:   Tue Jan 2 10:47:01 2018 +

Update translations for tor-launcher-network-settings_completed
---
 sv/network-settings.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sv/network-settings.dtd b/sv/network-settings.dtd
index d15813496..927532c2f 100644
--- a/sv/network-settings.dtd
+++ b/sv/network-settings.dtd
@@ -42,7 +42,7 @@
 
 
 
-
+
 
 
 
@@ -50,8 +50,8 @@
 
 
 
-
-
+
+
 
 
 

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

[tor-commits] [webwml/master] another update-mirror run

2018-01-02 Thread arma

commit 509f2fd5c45148fdd921a5aa8cd4a9ce32bd165b
Author: Roger Dingledine 
Date:   Tue Jan 2 04:20:23 2018 -0500

another update-mirror run
---
 include/mirrors-table.wmi | 538 ++
 include/tor-mirrors.csv   | 188 
 2 files changed, 397 insertions(+), 329 deletions(-)

diff --git a/include/mirrors-table.wmi b/include/mirrors-table.wmi
index 7b2610ac..2ec2b071 100644
--- a/include/mirrors-table.wmi
+++ b/include/mirrors-table.wmi
@@ -1,19 +1,19 @@
  
 
 
- ES
+ UA
 
- Tor Supporter
+ IP-Connect LLC
 
  Up to date
 
- - 
-http://tor.zilog.es/dist/;>http
-http://tor.zilog.es/;>http
-https://tor.zilog.es/dist/;>https
-https://tor.zilog.es/;>https
+ftp://torproject.ip-connect.vn.ua/mirror/torproject/;>ftp
+http://torproject.ip-connect.vn.ua/dist;>http
+http://torproject.ip-connect.vn.ua;>http
  - 
  - 
+rsync
+rsync
 
  
 
@@ -52,32 +52,32 @@
  
 
 
- MX
+ US
 
- Tor Supporter
+ Evil Routers
 
  Up to date
 
  - 
-http://fbnaia.homelinux.net/torproject/dist/;>http
-http://fbnaia.homelinux.net/torproject/;>http
-https://fbnaia.homelinux.net/torproject/dist/;>https
-https://fbnaia.homelinux.net/torproject/;>https
+http://tor1.evilrouters.net/dist/;>http
+http://tor1.evilrouters.net/;>http
+ - 
+ - 
  - 
  - 
 
  
 
 
- IS
+ XX
 
- TheOnionRouter
+ TvdW
 
  Up to date
 
  - 
-http://www.theonionrouter.com/dist/;>http
-http://www.theonionrouter.com/;>http
+http://tor-exit.network/dist;>http
+http://tor-exit.network;>http
  - 
  - 
  - 
@@ -86,17 +86,17 @@
  
 
 
- DE
+ US
 
- crazyhaze.de
+ The Calyx Institute
 
  Up to date
 
  - 
-http://tor.crazyhaze.de/dist/;>http
-http://tor.crazyhaze.de/;>http
-https://tor.crazyhaze.de/dist/;>https
-https://tor.crazyhaze.de/;>https
+http://tor.calyxinstitute.org/dist/;>http
+http://tor.calyxinstitute.org;>http
+https://tor.calyxinstitute.org/dist/;>https
+https://tor.calyxinstitute.org;>https
  - 
  - 
 
@@ -110,27 +110,61 @@
  Up to date
 
  - 
-http://mirror.velcommuta.de/tor/dist/;>http
-http://mirror.velcommuta.de/tor/;>http
-https://mirror.velcommuta.de/tor/dist/;>https
-https://mirror.velcommuta.de/tor/;>https
+http://torproject.mirror.metalgamer.eu/dist/;>http
+http://torproject.mirror.metalgamer.eu/;>http
+https://torproject.mirror.metalgamer.eu/dist/;>https
+https://torproject.mirror.metalgamer.eu/;>https
  - 
  - 
 
  
 
 
- DE
+ NL
 
- 0x3d.lu
+ Babylon Network
+
+ Up to date
+
+ftp://nl.mirror.babylon.network/torproject/;>ftp
+http://nl.mirror.babylon.network/torproject/dist/;>http
+http://nl.mirror.babylon.network/torproject/;>http
+https://nl.mirror.babylon.network/torproject/dist/;>https
+https://nl.mirror.babylon.network/torproject/;>https
+rsync
+rsync
+
+ 
+
+
+ FR
+
+ Babylon Network
+
+ Up to date
+
+ftp://fr.mirror.babylon.network/torproject/;>ftp
+http://fr.mirror.babylon.network/torproject/dist/;>http
+http://fr.mirror.babylon.network/torproject/;>http
+https://fr.mirror.babylon.network/torproject/dist/;>https
+https://fr.mirror.babylon.network/torproject/;>https
+rsync
+rsync
+
+ 
+
+
+ VN
+
+ Freedif
 
  Up to date
 
  - 
-http://tor.0x3d.lu/dist/;>http
-http://tor.0x3d.lu/;>http
-https://tor.0x3d.lu/dist/;>https
-https://tor.0x3d.lu/;>https
+http://mirror.freedif.org/TorProject/dist;>http
+http://mirror.freedif.org/TorProject/;>http
+https://mirror.freedif.org/TorProject/dist;>https
+https://mirror.freedif.org/TorProject/;>https
  - 
  - 
 
@@ -139,185 +173,202 @@
 
  DE
 
- Netzkonstrukt Berlin
+ Tor Supporter
 
  Up to date
 
  - 
-http://mirror.ntzk.de/torproject.org/dist/;>http
-http://mirror.ntzk.de/torproject.org/;>http
-https://mirror.ntzk.de/torproject.org/dist/;>https
-https://mirror.ntzk.de/torproject.org/;>https
- - 
+http://tor.heikorichter.name/dist;>http
+http://tor.heikorichter.name;>http
+https://tor.heikorichter.name/dist;>https
+https://tor.heikorichter.name;>https
+rsync
  - 
 
  
 
 
- FR
+ CA
 
- wardsback.org
+ secure.voyage
 
  Up to date
 
  - 
-http://alliumcepa.wardsback.org/dist/;>http
-http://alliumcepa.wardsback.org/;>http
- - 
- - 
+http://tor.secure.voyage/dist;>http
+http://tor.secure.voyage;>http
+https://tor.secure.voyage/dist;>https
+https://tor.secure.voyage;>https
  - 
  -

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2018-01-02 Thread translation

commit 228b9fe35b6e3506ea8aaecd28b53085a7bdb806
Author: Translation commit bot 
Date:   Tue Jan 2 09:16:04 2018 +

Update translations for tails-persistence-setup
---
 ro/ro.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ro/ro.po b/ro/ro.po
index 9fdc12e39..c1ff0a7a1 100644
--- a/ro/ro.po
+++ b/ro/ro.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Adrian Staicu , 2018
 # Alex Alex , 2016
 # Andrei Draga, 2013
 # Mariana Mazilu , 2015
@@ -14,8 +15,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2017-05-15 13:51+0200\n"
-"PO-Revision-Date: 2017-09-19 17:08+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-01-02 08:48+\n"
+"Last-Translator: Adrian Staicu \n"
 "Language-Team: Romanian 
(http://www.transifex.com/otf/torproject/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,11 +58,11 @@ msgstr "Profile Pidgin Èi inel de chei OTR"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
 msgid "Thunderbird"
-msgstr ""
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
 msgid "Thunderbird profiles and locally stored email"
-msgstr ""
+msgstr "Profile Thunderbird Èi email-uri stocate local"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"

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

[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2018-01-02 Thread translation

commit 9a05fdcb6db32e447078b53db6b94c98822d3357
Author: Translation commit bot 
Date:   Tue Jan 2 09:16:11 2018 +

Update translations for tails-persistence-setup_completed
---
 ro/ro.po | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/ro/ro.po b/ro/ro.po
index a498d0bd2..c1ff0a7a1 100644
--- a/ro/ro.po
+++ b/ro/ro.po
@@ -3,7 +3,8 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alex Alexandru , 2016
+# Adrian Staicu , 2018
+# Alex Alex , 2016
 # Andrei Draga, 2013
 # Mariana Mazilu , 2015
 # kyx , 2016
@@ -13,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
-"PO-Revision-Date: 2016-06-06 08:15+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
+"PO-Revision-Date: 2018-01-02 08:48+\n"
+"Last-Translator: Adrian Staicu \n"
 "Language-Team: Romanian 
(http://www.transifex.com/otf/torproject/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,12 +57,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Profile Pidgin Èi inel de chei OTR"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Profile Icedove Èi email-uri stocate local"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Profile Thunderbird Èi email-uri stocate local"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"

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

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

2018-01-02 Thread translation

commit d15d6ca6a8f986099aeb6b3e45aa066ce4d8e1a1
Author: Translation commit bot 
Date:   Tue Jan 2 08:47:21 2018 +

Update translations for tails-misc_completed
---
 ro.po | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ro.po b/ro.po
index 827735d67..b55df77b9 100644
--- a/ro.po
+++ b/ro.po
@@ -3,10 +3,11 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Adrian Staicu , 2018
 # Alex Alex , 2016
 # Andrei Draga, 2013
 # axel_89, 2015
-# David , 2015
+# dev0d , 2015
 # Di N., 2015
 # Draga Bianca - Madalina , 2014
 # kyx , 2016
@@ -20,9 +21,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-05 11:57+0200\n"
-"PO-Revision-Date: 2017-05-26 14:47+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2017-09-13 20:10+0200\n"
+"PO-Revision-Date: 2018-01-02 08:46+\n"
+"Last-Translator: Adrian Staicu \n"
 "Language-Team: Romanian 
(http://www.transifex.com/otf/torproject/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -345,3 +346,7 @@ msgstr "Browser Web neprotejat"
 #: 
../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2
 msgid "Tails specific tools"
 msgstr "Unelte specifice Tails"
+
+#: 
../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.root-terminal.policy.in.h:1
+msgid "To start a Root Terminal, you need to authenticate."
+msgstr "Pentru a porni un Terminal Root trebuie sÄ te autentifici."

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

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

2018-01-02 Thread translation

commit 8a94958381ffc65f2da31aa48ff643310b22913b
Author: Translation commit bot 
Date:   Tue Jan 2 08:47:13 2018 +

Update translations for tails-misc
---
 ro.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ro.po b/ro.po
index 9a1183d2d..b55df77b9 100644
--- a/ro.po
+++ b/ro.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Adrian Staicu , 2018
 # Alex Alex , 2016
 # Andrei Draga, 2013
 # axel_89, 2015
@@ -21,8 +22,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-13 20:10+0200\n"
-"PO-Revision-Date: 2017-12-25 22:58+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-01-02 08:46+\n"
+"Last-Translator: Adrian Staicu \n"
 "Language-Team: Romanian 
(http://www.transifex.com/otf/torproject/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -348,4 +349,4 @@ msgstr "Unelte specifice Tails"
 
 #: 
../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.root-terminal.policy.in.h:1
 msgid "To start a Root Terminal, you need to authenticate."
-msgstr ""
+msgstr "Pentru a porni un Terminal Root trebuie sÄ te autentifici."

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

74 matches

Mail list logo