date:20180105

[tor-commits] [depictor/master] Make it easy to search for the bug in #24628 which may not be happening anymore? Search for 'bwauth= '

2018-01-05 Thread tom

commit 4d0e8a74c88b9c43eed0d12e79b1c3ffcf3d6faf
Author: Tom Ritter 
Date:   Sat Jan 6 00:07:31 2018 -0600

Make it easy to search for the bug in #24628 which may not be happening 
anymore? Search for 'bwauth= '
---
 website.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website.py b/website.py
index 2e70fb4..bcc1cf1 100755
--- a/website.py
+++ b/website.py
@@ -1446,7 +1446,7 @@ class WebsiteWriter:
if not 
self.consensus.routers[relay_fp].is_unmeasured:
assigning_bwauths = 
self.__find_assigning_bwauth_for_bw_value(relay_fp)
self.site.write(" " if 
flagsWritten > 0 else "")
-   self.site.write("bwauth=" + 
",".join(assigning_bwauths))
+   self.site.write("bwauth=" + 
",".join(assigning_bwauths) + " ")
flagsWritten += 1
 
self.site.write("\n")

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

[tor-commits] [depictor/master] Actually, lets promote Unmeasured to a real pseudo-flag (part of #24691)

2018-01-05 Thread tom

commit 851852f884f4637b0d59a6b37135bd2677689334
Author: Tom Ritter 
Date:   Fri Jan 5 23:51:58 2018 -0600

Actually, lets promote Unmeasured to a real pseudo-flag (part of #24691)
---
 website.py | 19 ++-
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/website.py b/website.py
index 6a75dc2..2e70fb4 100755
--- a/website.py
+++ b/website.py
@@ -121,6 +121,19 @@ class WebsiteWriter:
if r in self.fallback_dirs:

self.consensus.routers[r].flags.append('FallbackDir')
 
+   # Create an Unmeasured flag
+   self.consensus.known_flags.append('Unmeasured')
+   for dirauth_nickname in self.known_authorities:
+   if dirauth_nickname in self.votes:
+   vote = self.votes[dirauth_nickname]
+   vote.known_flags.append('Unmeasured')
+   for r in vote.routers:
+   if r in self.consensus.routers and 
self.consensus.routers[r].is_unmeasured and not vote.routers[r].measured:
+   
vote.routers[r].flags.append('Unmeasured')
+   for r in self.consensus.routers:
+   if self.consensus.routers[r].is_unmeasured:
+   
self.consensus.routers[r].flags.append('Unmeasured')
+
 

#-
def _write_page_header(self, include_relay_info):
@@ -1430,11 +1443,7 @@ class WebsiteWriter:
self.site.write(" " if flagsWritten > 0 
else "")
self.site.write("bw=" + 
str(self.consensus.routers[relay_fp].bandwidth))
flagsWritten += 1
-   if 
self.consensus.routers[relay_fp].is_unmeasured:
-   self.site.write(" " if 
flagsWritten > 0 else "")
-   self.site.write("Unmeasured")
-   flagsWritten += 1
-   else:
+   if not 
self.consensus.routers[relay_fp].is_unmeasured:
assigning_bwauths = 
self.__find_assigning_bwauth_for_bw_value(relay_fp)
self.site.write(" " if 
flagsWritten > 0 else "")
self.site.write("bwauth=" + 
",".join(assigning_bwauths))

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

[tor-commits] [depictor/master] Tweak how Unmeasured is printed in the detail table

2018-01-05 Thread tom

commit 9da878582bb5fa865ea8e77a5534d44eee1f7b5d
Author: Tom Ritter 
Date:   Fri Jan 5 23:38:04 2018 -0600

Tweak how Unmeasured is printed in the detail table
---
 website.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/website.py b/website.py
index ce2fe60..6a75dc2 100755
--- a/website.py
+++ b/website.py
@@ -1431,9 +1431,8 @@ class WebsiteWriter:
self.site.write("bw=" + 
str(self.consensus.routers[relay_fp].bandwidth))
flagsWritten += 1
if 
self.consensus.routers[relay_fp].is_unmeasured:
-   assigning_bwauths = 
self.__find_assigning_bwauth_for_bw_value(relay_fp)
self.site.write(" " if 
flagsWritten > 0 else "")
-   self.site.write("unmeasured=1")
+   self.site.write("Unmeasured")
flagsWritten += 1
else:
assigning_bwauths = 
self.__find_assigning_bwauth_for_bw_value(relay_fp)



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

[tor-commits] [depictor/master] Add hsdir_spread_store to known_params

2018-01-05 Thread tom

commit bc285fbb72209a5c2c6b36e081fbb369213202cf
Author: Tom Ritter 
Date:   Fri Jan 5 23:37:39 2018 -0600

Add hsdir_spread_store to known_params
---
 data/consensus.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/consensus.cfg b/data/consensus.cfg
index fd7a7bb..02f39b1 100644
--- a/data/consensus.cfg
+++ b/data/consensus.cfg
@@ -35,4 +35,4 @@ known_params usecreatefast
 known_params NumDirectoryGuards
 known_params NumEntryGuards
 known_params Support022HiddenServices
-
+known_params hsdir_spread_store



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

[tor-commits] [depictor/master] Refactor the FallbackDir Pseudo-Flag (part of #24691)

2018-01-05 Thread tom

commit d038a0d05f62d7f390818e97dbd9204e72f5fced
Author: Tom Ritter 
Date:   Fri Jan 5 22:30:31 2018 -0600

Refactor the FallbackDir Pseudo-Flag (part of #24691)
---
 data/consensus.cfg |  2 +-
 website.py | 22 --
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/data/consensus.cfg b/data/consensus.cfg
index e05818f..fd7a7bb 100644
--- a/data/consensus.cfg
+++ b/data/consensus.cfg
@@ -1,7 +1,7 @@
 # control consensus-health output
 
 # do not show all fallback directory output
-ignore_fallback_authorities True
+ignore_fallback_authorities False
 
 # do not show values less than this amount on the graph. For small testing 
networks set to 1
 graph_logical_min 125
diff --git a/website.py b/website.py
index fc9cf91..ce2fe60 100755
--- a/website.py
+++ b/website.py
@@ -107,6 +107,21 @@ class WebsiteWriter:
self.consensus.known_flags.append('ReachableIPv6')
self.consensus.known_flags.append('NoIPv6Consensus')
 
+   # Add the FallbackDir flag
+   if not self.config['ignore_fallback_authorities']:
+   self.consensus.known_flags.append('FallbackDir')
+   for dirauth_nickname in self.known_authorities:
+   if dirauth_nickname in self.votes:
+   vote = self.votes[dirauth_nickname]
+   vote.known_flags.append('FallbackDir')
+   for r in vote.routers:
+   if r in self.fallback_dirs:
+   
vote.routers[r].flags.append('FallbackDir')
+   for r in self.consensus.routers:
+   if r in self.fallback_dirs:
+   
self.consensus.routers[r].flags.append('FallbackDir')
+
+

#-
def _write_page_header(self, include_relay_info):
"""
@@ -962,7 +977,7 @@ class WebsiteWriter:
Write the status of the fallback directory mirrors
"""
if self.config['ignore_fallback_authorities']:
-   return
+   return
 
self.site.write("\n\n\n"
+ " "
@@ -1426,11 +1441,6 @@ class WebsiteWriter:
self.site.write("bwauth=" + 
",".join(assigning_bwauths))
flagsWritten += 1
 
-   if relay_fp in self.fallback_dirs:
-   self.site.write(" " if flagsWritten > 0 
else "")
-   self.site.write("FallbackDir")
-   flagsWritten += 1
-
self.site.write("\n")
else:
self.site.write("\n")

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

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

2018-01-05 Thread translation

commit 84db3f4a1714d14af693461d882ef72e27d65f98
Author: Translation commit bot 
Date:   Sat Jan 6 04:50:57 2018 +

Update translations for tor-browser-manual
---
 ar/ar.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ar/ar.po b/ar/ar.po
index 52d598ded..6889f65b9 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -7,6 +7,7 @@
 # runasand , 2016
 # Leya Hanna , 2016
 # ASSYASS Mahmoud , 2017
+# blah bleh , 2017
 # Jacob Leppek , 2017
 # mohammad ali , 2017
 msgid ""
@@ -438,8 +439,8 @@ msgid ""
 "To get links for downloading Tor Browser in Chinese for Linux, send a "
 "message to get...@torproject.org with the words \"linux zh\" in it."
 msgstr ""
-"ÙÙØØµÙÙ Ø¹ÙÙ Ø±ÙØ§Ø¨Ø· ØªÙØ²ÙÙ ÙØªØµÙÙØ Tor Ø¨Ø§ÙØµÙÙÙØ© 
ÙÙØ¸Ø§Ù LinuxØ Ø¥Ø¨Ø¹Ø« Ø¨Ø±Ø³Ø§ÙØ© ÙØ¨Ø§Ø´Ø±Ø© "
-"Ø§ÙÙ @get_tor ØªØØªÙÙ Ø¹ÙÙ ÙÙÙØ§Øª linux zh."
+"ÙÙØØµÙÙ Ø¹ÙÙ Ø±ÙØ§Ø¨Ø· ØªÙØ²ÙÙ ÙØªØµÙÙØ Tor Ø¨Ø§ÙÙØºØ© 
Ø§ÙØµÙÙÙØ© ÙÙØ¸Ø§Ù LinuxØ Ø¥Ø¨Ø¹Ø« Ø¨Ø±Ø³Ø§ÙØ© "
+"ÙØ¨Ø§Ø´Ø±Ø© Ø§ÙÙ get...@torproject.org ØªØØªÙÙ Ø¹ÙÙ Ø§ÙÙÙÙØ§Øª 
\"linux zh\"."
 
 #: downloading.page:84
 msgid "Satori"

___
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

2018-01-05 Thread translation

commit 167dad780d8c8015ea75f60a579e54e444af611e
Author: Translation commit bot 
Date:   Sat Jan 6 04:45:07 2018 +

Update translations for bridgedb
---
 ar/LC_MESSAGES/bridgedb.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po
index da0f611bd..2e4861b97 100644
--- a/ar/LC_MESSAGES/bridgedb.po
+++ b/ar/LC_MESSAGES/bridgedb.po
@@ -8,6 +8,7 @@
 # Ahmad Gharbeia , 2014
 # allamiro , 2011
 # Ash , 2014
+# blah bleh , 2018
 # debo debo , 2015
 # Mohamed El-Feky , 2014
 # AnonymousLady , 2014
@@ -27,8 +28,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: 2017-10-27 04:27+\n"
-"Last-Translator: Abderrahman Ait Ali \n"
+"PO-Revision-Date: 2018-01-06 04:35+\n"
+"Last-Translator: blah bleh \n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,7 +79,7 @@ msgstr "Ø§Ø¸ÙØ§Ø± Ø§Ù QR ÙÙØ¯"
 
 #: bridgedb/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr "QRCode Ø§ÙØªØ§Ø¨Ø¹ ÙØ®Ø·ÙØ· Ø¬Ø³Ø±Ù"
+msgstr "ÙÙØ¯ Ø§ÙQR Ø§ÙØªØ§Ø¨Ø¹ ÙØ®Ø·ÙØ· Ø¬Ø³Ø±Ù"
 
 #. TRANSLATORS: Please translate this into some silly way to say
 #. "There was a problem!" in your language. For example,

___
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

2018-01-05 Thread translation

commit 6364037387149f78ca5c8eed7d61b7d4181989cd
Author: Translation commit bot 
Date:   Sat Jan 6 04:45:15 2018 +

Update translations for bridgedb_completed
---
 ar/LC_MESSAGES/bridgedb.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po
index da0f611bd..2e4861b97 100644
--- a/ar/LC_MESSAGES/bridgedb.po
+++ b/ar/LC_MESSAGES/bridgedb.po
@@ -8,6 +8,7 @@
 # Ahmad Gharbeia , 2014
 # allamiro , 2011
 # Ash , 2014
+# blah bleh , 2018
 # debo debo , 2015
 # Mohamed El-Feky , 2014
 # AnonymousLady , 2014
@@ -27,8 +28,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: 2017-10-27 04:27+\n"
-"Last-Translator: Abderrahman Ait Ali \n"
+"PO-Revision-Date: 2018-01-06 04:35+\n"
+"Last-Translator: blah bleh \n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,7 +79,7 @@ msgstr "Ø§Ø¸ÙØ§Ø± Ø§Ù QR ÙÙØ¯"
 
 #: bridgedb/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr "QRCode Ø§ÙØªØ§Ø¨Ø¹ ÙØ®Ø·ÙØ· Ø¬Ø³Ø±Ù"
+msgstr "ÙÙØ¯ Ø§ÙQR Ø§ÙØªØ§Ø¨Ø¹ ÙØ®Ø·ÙØ· Ø¬Ø³Ø±Ù"
 
 #. TRANSLATORS: Please translate this into some silly way to say
 #. "There was a problem!" in your language. For example,

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

[tor-commits] [webwml/master] updated mirror run

2018-01-05 Thread arma

commit f2c4be291db08f8786c656bd43e96b2282559e1a
Author: Roger Dingledine 
Date:   Fri Jan 5 20:43:11 2018 -0500

updated mirror run
---
 include/mirrors-table.wmi | 620 ++
 include/tor-mirrors.csv   | 186 +++---
 2 files changed, 386 insertions(+), 420 deletions(-)

diff --git a/include/mirrors-table.wmi b/include/mirrors-table.wmi
index 2ec2b071..4b34a281 100644
--- a/include/mirrors-table.wmi
+++ b/include/mirrors-table.wmi
@@ -1,66 +1,66 @@
  
 
 
- UA
+ DE
 
- IP-Connect LLC
+ TB-ITF
 
  Up to date
 
-ftp://torproject.ip-connect.vn.ua/mirror/torproject/;>ftp
-http://torproject.ip-connect.vn.ua/dist;>http
-http://torproject.ip-connect.vn.ua;>http
+ftp://tormirror.tb-itf-tor.de/;>ftp
+http://tormirror.tb-itf-tor.de/dist/;>http
+http://tormirror.tb-itf-tor.de;>http
+https://tormirror.tb-itf-tor.de/dist/;>https
+https://tormirror.tb-itf-tor.de;>https
  - 
  - 
-rsync
-rsync
 
  
 
 
- IS
+ CA
 
- torproject.is
+ secure.voyage
 
  Up to date
 
  - 
-http://www.torproject.is/dist/;>http
-http://www.torproject.is/;>http
- - 
- - 
+http://tor.secure.voyage/dist;>http
+http://tor.secure.voyage;>http
+https://tor.secure.voyage/dist;>https
+https://tor.secure.voyage;>https
  - 
  - 
 
  
 
 
- AT
+ UA
 
- ph3x
+ IP-Connect LLC
 
  Up to date
 
- - 
-http://torproject.ph3x.at/dist/;>http
-http://torproject.ph3x.at;>http
-https://torproject.ph3x.at/dist/;>https
-https://torproject.ph3x.at;>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
 
  
 
 
- US
+ IS
 
- Evil Routers
+ Frenn vun der Enn A.S.B.L.
 
  Up to date
 
  - 
-http://tor1.evilrouters.net/dist/;>http
-http://tor1.evilrouters.net/;>http
+http://torproject.lu/dist/;>http
+http://torproject.lu/;>http
  - 
  - 
  - 
@@ -69,15 +69,15 @@
  
 
 
- XX
+ NO
 
- TvdW
+ MultiNet AS
 
  Up to date
 
  - 
-http://tor-exit.network/dist;>http
-http://tor-exit.network;>http
+http://tor.multinet.no/dist/;>http
+http://tor.multinet.no/;>http
  - 
  - 
  - 
@@ -86,85 +86,51 @@
  
 
 
- US
+ IS
 
- The Calyx Institute
+ torproject.is
 
  Up to date
 
  - 
-http://tor.calyxinstitute.org/dist/;>http
-http://tor.calyxinstitute.org;>http
-https://tor.calyxinstitute.org/dist/;>https
-https://tor.calyxinstitute.org;>https
+http://www.torproject.is/dist/;>http
+http://www.torproject.is/;>http
+ - 
+ - 
  - 
  - 
 
  
 
 
- DE
+ AT
 
- Tor Supporter
+ ph3x
 
  Up to date
 
  - 
-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
+http://torproject.ph3x.at/dist/;>http
+http://torproject.ph3x.at;>http
+https://torproject.ph3x.at/dist/;>https
+https://torproject.ph3x.at;>https
  - 
  - 
 
  
 
 
- NL
-
- 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
+ IS
 
- Freedif
+ TheOnionRouter
 
  Up to date
 
  - 
-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
+http://www.theonionrouter.com/dist/;>http
+http://www.theonionrouter.com/;>http
+ - 
+ - 
  - 
  - 
 
@@ -173,49 +139,49 @@
 
  DE
 
- Tor Supporter
+ crazyhaze.de
 
  Up to date
 
  - 
-http://tor.heikorichter.name/dist;>http
-http://tor.heikorichter.name;>http
-

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

2018-01-05 Thread arma

commit 4f83d6d6ad336268d5befd757301c894e5072e1e
Merge: 143da7316 5f2c7a856
Author: Roger Dingledine 
Date:   Fri Jan 5 18:44:08 2018 -0500

Merge branch 'maint-0.3.2'

 src/common/crypto.c | 4 ++--
 1 file changed, 2 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 redundant "implement this" from log message

2018-01-05 Thread arma

commit 5f2c7a85671ee514892bc5ca265e6715d48cd0f8
Author: Roger Dingledine 
Date:   Fri Jan 5 18:23:07 2018 -0500

remove redundant "implement this" from log message
---
 src/common/crypto.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 380f038f4..c9db7cb4b 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -2877,10 +2877,10 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t 
out_len)
 
   /* Useful log message for errno. */
   if (errno == ENOSYS) {
-log_warn(LD_CRYPTO, "Can't get entropy from getrandom(). "
+log_warn(LD_CRYPTO, "Can't get entropy from getrandom()."
  " You are running a version of Tor built to support"
  " getrandom(), but the kernel doesn't implement this"
- " implement this function--probably because it is too old?");
+ " function--probably because it is too old?");
   } else {
 log_warn(LD_CRYPTO, "Can't get entropy from getrandom(): %s.",
  strerror(errno));



___
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-05 Thread arma

commit 0d172c1182bacb3c6d7e4538df87e706b720be30
Merge: 8edc0be74 5f2c7a856
Author: Roger Dingledine 
Date:   Fri Jan 5 18:26:14 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 src/common/crypto.c | 4 ++--
 1 file changed, 2 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/maint-0.3.2] remove redundant "implement this" from log message

2018-01-05 Thread arma

commit 5f2c7a85671ee514892bc5ca265e6715d48cd0f8
Author: Roger Dingledine 
Date:   Fri Jan 5 18:23:07 2018 -0500

remove redundant "implement this" from log message
---
 src/common/crypto.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 380f038f4..c9db7cb4b 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -2877,10 +2877,10 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t 
out_len)
 
   /* Useful log message for errno. */
   if (errno == ENOSYS) {
-log_warn(LD_CRYPTO, "Can't get entropy from getrandom(). "
+log_warn(LD_CRYPTO, "Can't get entropy from getrandom()."
  " You are running a version of Tor built to support"
  " getrandom(), but the kernel doesn't implement this"
- " implement this function--probably because it is too old?");
+ " function--probably because it is too old?");
   } else {
 log_warn(LD_CRYPTO, "Can't get entropy from getrandom(): %s.",
  strerror(errno));

___
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] remove redundant "implement this" from log message

2018-01-05 Thread arma

commit 5f2c7a85671ee514892bc5ca265e6715d48cd0f8
Author: Roger Dingledine 
Date:   Fri Jan 5 18:23:07 2018 -0500

remove redundant "implement this" from log message
---
 src/common/crypto.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 380f038f4..c9db7cb4b 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -2877,10 +2877,10 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t 
out_len)
 
   /* Useful log message for errno. */
   if (errno == ENOSYS) {
-log_warn(LD_CRYPTO, "Can't get entropy from getrandom(). "
+log_warn(LD_CRYPTO, "Can't get entropy from getrandom()."
  " You are running a version of Tor built to support"
  " getrandom(), but the kernel doesn't implement this"
- " implement this function--probably because it is too old?");
+ " function--probably because it is too old?");
   } else {
 log_warn(LD_CRYPTO, "Can't get entropy from getrandom(): %s.",
  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/fallback-code-2018-01'

2018-01-05 Thread nickm

commit 143da73165d48f21300ee6771b269db98ac76632
Merge: 0b6fe3c12 65520f1bd
Author: Nick Mathewson 
Date:   Fri Jan 5 16:47:28 2018 -0500

Merge remote-tracking branch 'teor/fallback-code-2018-01'

 changes/bug20942  |   3 +
 changes/bug24708  |   4 +
 changes/ticket22321   |   3 +
 changes/ticket22759   |   5 +
 changes/ticket24600   |   5 +
 changes/ticket24679   |   5 +
 changes/ticket24706   |   6 +
 changes/ticket24725   |   5 +
 changes/ticket24726   |   4 +
 changes/ticket24785   |   6 +
 changes/ticket24791   |   3 +
 scripts/maint/fallback.blacklist  |  54 +--
 scripts/maint/fallback.whitelist  | 323 ++---
 scripts/maint/generateFallbackDirLine.py  |  38 ++
 scripts/maint/lookupFallbackDirContact.py |  28 ++
 scripts/maint/updateFallbackDirs.py   | 225 ++---
 src/or/fallback_dirs.inc  | 761 --
 17 files changed, 1146 insertions(+), 332 deletions(-)

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

[tor-commits] [tor/master] Stop logging excessive information about fallback netblocks

2018-01-05 Thread nickm

commit 65520f1bde36286765424cf29f50d67cbc9d8df1
Author: teor 
Date:   Fri Jan 5 00:23:52 2018 +1100

Stop logging excessive information about fallback netblocks

Implements ticket 24791
---
 changes/ticket24791 | 3 +++
 scripts/maint/updateFallbackDirs.py | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/ticket24791 b/changes/ticket24791
new file mode 100644
index 0..092ae8511
--- /dev/null
+++ b/changes/ticket24791
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring (fallbacks):
+- Stop logging excessive information about fallback netblocks.
+  Implements ticket 24791.
diff --git a/scripts/maint/updateFallbackDirs.py 
b/scripts/maint/updateFallbackDirs.py
index 9f44bc097..dbd15eb51 100755
--- a/scripts/maint/updateFallbackDirs.py
+++ b/scripts/maint/updateFallbackDirs.py
@@ -1996,7 +1996,7 @@ class CandidateList(dict):
# this doesn't actually tell us anything useful
#self.describe_fallback_ipv4_netblock_mask(8)
self.describe_fallback_ipv4_netblock_mask(16)
-   self.describe_fallback_ipv4_netblock_mask(24)
+   #self.describe_fallback_ipv4_netblock_mask(24)
 
   # log a message about the proportion of fallbacks in each IPv6 /12 (RIR),
   # /23 (smaller RIR blocks), /32 (LIR), /48 (Customer), and /64 (Host)
@@ -2006,7 +2006,7 @@ class CandidateList(dict):
 #self.describe_fallback_ipv6_netblock_mask(12)
 #self.describe_fallback_ipv6_netblock_mask(23)
 self.describe_fallback_ipv6_netblock_mask(32)
-self.describe_fallback_ipv6_netblock_mask(48)
+#self.describe_fallback_ipv6_netblock_mask(48)
 self.describe_fallback_ipv6_netblock_mask(64)
 
   # log a message about the proportion of fallbacks in each IPv4 and IPv6



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

[tor-commits] [tor/master] Update dependency list for the fallback script

2018-01-05 Thread nickm

commit befcc56d84f6070013ef2df6d734ac06e7b4533e
Author: teor 
Date:   Fri Dec 22 23:38:37 2017 +1100

Update dependency list for the fallback script

Comment-only change.

Implements #24711.
---
 scripts/maint/updateFallbackDirs.py | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/scripts/maint/updateFallbackDirs.py 
b/scripts/maint/updateFallbackDirs.py
index 81fb26f88..fafc4f129 100755
--- a/scripts/maint/updateFallbackDirs.py
+++ b/scripts/maint/updateFallbackDirs.py
@@ -14,14 +14,12 @@
 # If this is not possible, please disable:
 # PERFORM_IPV4_DIRPORT_CHECKS and PERFORM_IPV6_DIRPORT_CHECKS
 #
-# Needs dateutil (and potentially other python packages)
-# Needs stem available in your PYTHONPATH, or just ln -s ../stem/stem .
+# Needs dateutil, stem, and potentially other python packages.
 # Optionally uses ipaddress (python 3 builtin) or py2-ipaddress (package)
-# for netblock analysis, in PYTHONPATH, or just
-# ln -s ../py2-ipaddress-3.4.1/ipaddress.py .
+# for netblock analysis.
 #
 # Then read the logs to make sure the fallbacks aren't dominated by a single
-# netblock or port
+# netblock or port.
 
 # Script by weasel, April 2015
 # Portions by gsathya & karsten, 2013



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

[tor-commits] [tor/master] Remove an incorrect C comment from updateFallbackDirs.py's list generation code

2018-01-05 Thread nickm

commit d8ab1b803ab66c3c8c4393c1575b067da95ce73d
Author: teor 
Date:   Tue Dec 26 18:23:11 2017 +1100

Remove an incorrect C comment from updateFallbackDirs.py's list generation 
code

Part of #24725.
---
 scripts/maint/updateFallbackDirs.py | 4 
 1 file changed, 4 deletions(-)

diff --git a/scripts/maint/updateFallbackDirs.py 
b/scripts/maint/updateFallbackDirs.py
index 30c63a5b8..54b50c377 100755
--- a/scripts/maint/updateFallbackDirs.py
+++ b/scripts/maint/updateFallbackDirs.py
@@ -2114,10 +2114,6 @@ class CandidateList(dict):
   def summarise_fallbacks(self, eligible_count, operator_count, failed_count,
   guard_count, target_count):
 s = ''
-s += '/* To comment-out entries in this file, use C comments, and add *'
-s += ' to the start of each line. (stem finds fallback entries using "'
-s += ' at the start of a line.) */'
-s += '\n'
 # Report:
 #  whether we checked consensus download times
 #  the number of fallback directories (and limits/exclusions, if relevant)



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

[tor-commits] [tor/master] Remove an incorrect C comment in the current fallback list

2018-01-05 Thread nickm

commit 70490df76a65387ea56fa2ed307faf5a4a152914
Author: teor 
Date:   Tue Dec 26 18:26:27 2017 +1100

Remove an incorrect C comment in the current fallback list

Follow-up to #24725
---
 src/or/fallback_dirs.inc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc
index dfac15e1e..912a8853c 100644
--- a/src/or/fallback_dirs.inc
+++ b/src/or/fallback_dirs.inc
@@ -2,7 +2,6 @@
 /* version=2.0.0 */
 /* = */
 /* Whitelist & blacklist excluded 1326 of 1513 candidates. */
-/* To comment-out entries in this file, use C comments, and add * to the start 
of each line. (stem finds fallback entries using " at the start of a line.) */
 /* Checked IPv4 DirPorts served a consensus within 15.0s. */
 /*
 Final Count: 151 (Eligible 187, Target 392 (1963 * 0.20), Max 200)



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

[tor-commits] [tor/master] Make updateFallbackDirs.py search harder for python

2018-01-05 Thread nickm

commit 91a8b37a2ec9dd91ad4b1ce55eb25b1d5de8d4ea
Author: teor 
Date:   Fri Dec 22 21:42:59 2017 +1100

Make updateFallbackDirs.py search harder for python

(Some OSs don't put it in /usr/bin.)

Fixes bug 24708; bugfix on 0.2.8.1-alpha.
---
 changes/bug24708| 4 
 scripts/maint/updateFallbackDirs.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug24708 b/changes/bug24708
new file mode 100644
index 0..89eb4f97f
--- /dev/null
+++ b/changes/bug24708
@@ -0,0 +1,4 @@
+  o Minor bugfixes (fallback directory mirrors):
+- Make updateFallbackDirs.py search harder for python.
+  (Some OSs don't put it in /usr/bin.)
+  Fixes bug 24708; bugfix on 0.2.8.1-alpha.
diff --git a/scripts/maint/updateFallbackDirs.py 
b/scripts/maint/updateFallbackDirs.py
index 4c0a30a5e..81fb26f88 100755
--- a/scripts/maint/updateFallbackDirs.py
+++ b/scripts/maint/updateFallbackDirs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Usage:
 #



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

[tor-commits] [tor/master] Revise the generateFallbackDirLine.py script to use descriptors

2018-01-05 Thread nickm

commit 2ae33e486e3c4bc4dfa6c9fcda99dd15f74b31e9
Author: teor 
Date:   Wed Dec 27 13:18:05 2017 +1100

Revise the generateFallbackDirLine.py script to use descriptors

Patch by atagar, part of #24706.
---
 changes/ticket24706  |  2 +-
 scripts/maint/generateFallbackDirLine.py | 47 +++-
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/changes/ticket24706 b/changes/ticket24706
index 716f88c89..fadb7a23b 100644
--- a/changes/ticket24706
+++ b/changes/ticket24706
@@ -3,4 +3,4 @@
   fallback directory mirror lines from relay fingerprints. No more typos!
   Add the lookupFallbackDirContact.py script for automatically looking up
   operator contact info from relay fingerprints.
-  Implements ticket 24706.
+  Implements ticket 24706, patch by teor and atagar.
diff --git a/scripts/maint/generateFallbackDirLine.py 
b/scripts/maint/generateFallbackDirLine.py
index b59edc33f..b856c938b 100755
--- a/scripts/maint/generateFallbackDirLine.py
+++ b/scripts/maint/generateFallbackDirLine.py
@@ -7,35 +7,32 @@
 # generateFallbackDirLine.py fingerprint ...
 
 import sys
+import urllib2
 
-import stem.descriptor.remote as remote
+import stem.descriptor.remote
+import stem.util.tor_tools
 
 if len(sys.argv) <= 1:
-  print "Usage: {} fingerprint ...".format(sys.argv[0])
-  sys.exit(-1)
-
-# we need the full consensus, because it has IPv6 ORPorts
-# and we want a fingerprint to router mapping in routers
-#
-# stem returns document_handler='DOCUMENT' as a list of consensuses
-# with one entry
-consensus = remote.get_consensus(document_handler='DOCUMENT').run()[0]
+  print('Usage: %s fingerprint ...' % sys.argv[0])
+  sys.exit(1)
 
 for fingerprint in sys.argv[1:]:
-  if fingerprint in consensus.routers:
-r = consensus.routers[fingerprint]
-# Tor clients don't use DirPorts, but old code requires one for fallbacks
-if r.dir_port is not None:
-  # IPv4:DirPort orport=ORPort id=Fingerprint ipv6=[IPv6]:IPv6ORPort # nick
-  ipv6_or_ap_list = [ apv for apv in r.or_addresses if apv[2] ]
-  ipv6_str = ""
-  if len(ipv6_or_ap_list) > 0:
-ipv6_or_ap = ipv6_or_ap_list[0]
-ipv6_str = " ipv6=[{}]:{}".format(ipv6_or_ap[0], ipv6_or_ap[1])
-  print ("{}:{} orport={} id={}{} # {}"
- .format(r.address, r.dir_port, r.or_port, r.fingerprint,
- ipv6_str, r.nickname))
+  if not stem.util.tor_tools.is_valid_fingerprint(fingerprint):
+print("'%s' isn't a valid relay fingerprint" % fingerprint)
+sys.exit(1)
+
+  try:
+desc = stem.descriptor.remote.get_server_descriptors(fingerprint).run()[0]
+  except urllib2.HTTPError as exc:
+if exc.code == 404:
+  print('# %s not found in recent descriptors' % fingerprint)
+  continue
 else:
-  print "# {} needs a DirPort".format(fingerprint)
+  raise
+
+  if not desc.dir_port:
+print("# %s needs a DirPort" % fingerprint)
   else:
-print "# {} not found in current consensus".format(fingerprint)
+ipv6_addresses = [(address, port) for address, port, is_ipv6 in 
desc.or_addresses if is_ipv6]
+ipv6_field = ' ipv6=[%s]:%s' % ipv6_addresses[0] if ipv6_addresses else ''
+print('%s:%s orport=%s id=%s%s # %s' % (desc.address, desc.dir_port, 
desc.or_port, fingerprint, ipv6_field, desc.nickname))



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

[tor-commits] [tor/master] Forgive fallback operators that were blacklisted due to a details change

2018-01-05 Thread nickm

commit 23dddaf49b3699fa813d491881681abae4078830
Author: teor 
Date:   Thu Jan 4 23:42:28 2018 +1100

Forgive fallback operators that were blacklisted due to a details change

(But have since run a stable relay.)

Part of #22321.
---
 scripts/maint/fallback.blacklist | 44 
 scripts/maint/fallback.whitelist | 14 +++--
 2 files changed, 12 insertions(+), 46 deletions(-)

diff --git a/scripts/maint/fallback.blacklist b/scripts/maint/fallback.blacklist
index fb368376f..1d0edfd0b 100644
--- a/scripts/maint/fallback.blacklist
+++ b/scripts/maint/fallback.blacklist
@@ -35,14 +35,6 @@
 62.210.207.124:9030 orport=9001 id=58938B1A5C4029B4415D38A4F36B7724273F4755 
ipv6=[2001:bc8:31eb:100::1]:9001
 62.210.207.124:9130 orport=9101 id=338D0AB6DBAB7B529B9C91B2FD770658000693C4 
ipv6=[2001:bc8:31eb:100::1]:9101
 
-# these fallback candidates fail the consensus download test in a way that
-# causes stem to hang (and not respond to ^C, at least on OS X)
-# (Is something sending weird responses to DirPort traffic?)
-#217.23.14.190:1194
-#151.80.164.147:80
-#148.251.255.92:80
-#78.142.19.59:80
-
 # Email sent directly to teor, verified using relay contact info
 216.17.99.183:80 orport=443 id=D52CD431CEF28E01B11F545A84347EE45524BCA7
 216.17.99.183:8080 orport=9001 id=EE21F83AB6F76E3B3FFCBA5C2496F789CB84E7C6
@@ -197,45 +189,12 @@
 # Email sent directly to teor, verified using relay contact info
 88.190.208.4:30555 orport=30556 id=030A6EB24725C05D8E0FCE21923CBA5223E75E0E
 
-# Fallback was on 0.2.8.2-alpha list, but changed fingerprint before 0.2.8.5
-46.101.102.71:80 orport=443 id=9504CB22EEB25D344DE63CB7A6F2C46F895C3686 
ipv6=[2a03:b0c0:3:d0::2ed:7001]:9050
-# Also blacklist anything with the new fingerprint
-id=9C8A123081EFBE022EF795630F447839DDFDDDEC
-
-# Fallbacks were on 0.2.8.2-alpha list, but downloads were slow before 0.2.8.5
-185.96.88.29:80 orport=443 id=86C281AD135058238D7A337D546C902BE8505DDE
-178.62.36.64:9030 orport=9001 id=B87C84E38DAECDE98E5AEE5786AFDC748F2C
-
-# Fallback was on 0.2.8.2-alpha list, but changed address before 0.2.8.5
-84.219.173.60:9030 orport=443 id=855BC2DABE24C861CD887DB9B2E950424B49FC34
-# Also blacklist anything with the new address
-84.216.235.55:9030 orport=443
-
-# Fallbacks were on 0.2.8.2-alpha list, but disappeared before 0.2.8.5
-81.7.17.171:80 orport=443 id=CFECDDCA990E3EF7B7EC958B22441386B6B8D820 
ipv6=[2a02:180:1:1::517:11ab]:443
-51.254.215.121:80 orport=443 id=262B66AD25C79588AD1FC8ED0E966395B47E5C1D
-185.100.85.138:80 orport=46356 id=5C4DF16A0029CC4F67D3E127356E68F219269859
-
 # Fallback was on 0.2.8.2-alpha list, but opted-out before 0.2.8.6
 37.187.1.149:9030 orport=9001 id=08DC0F3C6E3D9C527C1FC8745D35DD1B0DE1875D 
ipv6=[2001:41d0:a:195::1]:9001
 
 # Email sent directly to teor, verified using relay contact info
 195.154.15.227:9030 orport=9001 id=6C3E3AB2F5F03CD71B637D433BAD924A1ECC5796
 
-# Fallback was on 0.2.8.6 list, but changed IPv4 before 0.2.9
-195.154.8.111:80 orport=443 id=FCB6695F8F2DC240E974510A4B3A0F2B12AB5B64
-# Same operator, not on 0.2.8.6 list, also changed IPv4
-51.255.235.246:80 orport=443 id=9B99C72B02AF8E3E5BE3596964F9CACD0090D132
-
-# Fallback was on 0.2.8.6 list, but changed IPv4 before 0.2.9
-5.175.233.86:80 orport=443 id=5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33
-
-# Fallbacks were on 0.2.8.6 list, but went down before 0.2.9
-194.150.168.79:2 orport=1 id=29F1020B94BE25E6BE1AD13E93CE19D2131B487C
-94.126.23.174:9030 orport=9001 id=6FC6F08270D565BE89B7C819DD8E2D487397C073
-195.191.233.221:80 orport=443 id=DE134FC8E5CC4EC8A5DE66934E70AC9D70267197
-176.31.180.157:143 orport=22 id=E781F4EC69671B3F1864AE2753E0890351506329 
ipv6=[2001:41d0:8:eb9d::1]:22
-
 # Fallback was on 0.2.8.6 list, but opted-out before 0.2.9
 144.76.73.140:9030 orport=9001 id=6A640018EABF3DA9BAD9321AA37C2C87BBE1F907
 
@@ -253,9 +212,6 @@ id=9C8A123081EFBE022EF795630F447839DDFDDDEC
 # Email sent directly to teor, verified using relay contact info
 104.243.35.196:9030 orport=9001 id=FA3415659444AE006E7E9E5375E82F29700CFDFD
 
-# Relay changed IPv4 address, operator uncontactable
-138.201.130.32:9030 orport=9001 id=52AEA31188331F421B2EDB494DB65CD181E5B257
-
 # Emails sent directly to teor, verified using relay contact info
 217.12.199.208:80 orport=443 id=DF3AED4322B1824BF5539AE54B2D1B38E080FF05 
ipv6=[2a02:27a8:0:2::7e]:443
 
diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist
index f2f0acd1c..c6e23286d 100644
--- a/scripts/maint/fallback.whitelist
+++ b/scripts/maint/fallback.whitelist
@@ -112,8 +112,12 @@
 46.28.109.231:9030 orport=9001 id=F70B7C5CD72D74C7F9F2DC84FA9D20D51BA13610 
ipv6=[2a02:2b88:2:1::4205:1]:9001
 
 # Email sent directly to teor, verified using relay contact info
-85.235.250.88:80 orport=443 id=72B2B12A3F60408BDBC98C6DF53988D3A0B3F0EE
-185.96.180.29:80 orport=443 id=F93D8F37E35C390BCAD9F9069E13085B745EC216
+85.235.250.88:80 orport=443

[tor-commits] [tor/master] Add delimiters at the end of every fallback entry in the current list

2018-01-05 Thread nickm

commit c8c0e9167d32994aef073a403f3812e7629a08ec
Author: teor 
Date:   Sun Dec 24 12:54:13 2017 +1100

Add delimiters at the end of every fallback entry in the current list

Using this script:
sed -i.bak $'s|^,$|/* = */\\\n,|' src/or/fallback_dirs.inc
(Due to embedded newlines, this script only works in bash.)

And manually add a delimiter to the end of the header, and the start of
the fallback list.

This allows us to check that the code compiles, and the unit tests pass.
And it allows downstream users stem and atlas to adapt to the new format.

The upcoming fallback rebuild will automatically generate this new format.

Follow-up to 24725.
---
 src/or/fallback_dirs.inc | 153 +++
 1 file changed, 153 insertions(+)

diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc
index 170f1a01a..dfac15e1e 100644
--- a/src/or/fallback_dirs.inc
+++ b/src/or/fallback_dirs.inc
@@ -1,5 +1,6 @@
 /* type=fallback */
 /* version=2.0.0 */
+/* = */
 /* Whitelist & blacklist excluded 1326 of 1513 candidates. */
 /* To comment-out entries in this file, use C comments, and add * to the start 
of each line. (stem finds fallback entries using " at the start of a line.) */
 /* Checked IPv4 DirPorts served a consensus within 15.0s. */
@@ -16,659 +17,811 @@ URL: 
https:onionoo.torproject.orgdetails?fields=fingerprint%2Cnickname%2Ccontact
 Onionoo Source: uptime Date: 2017-05-16 07:00:00 Version: 4.0
 URL: 
https:onionoo.torproject.orguptime?first_seen_days=30-=V2Dir=relay_seen_days=-0
 */
+/* = */
 "176.10.104.240:80 orport=443 id=0111BA9B604669E636FFD5B503F382A4B7AD6E80"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "193.171.202.146:9030 orport=9001 id=01A9258A46E97FF8B2CAC7910577862C14F2C524"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "185.100.85.61:80 orport=443 id=025B66CEBC070FCB0519D206CF0CF4965C20C96E"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "185.97.32.18:9030 orport=9001 id=04250C3835019B26AA6764E85D836088BE441088"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "5.9.110.236:9030 orport=9001 id=0756B7CD4DFC8182BE23143FAC0642F515182CEB"
 " ipv6=[2a01:4f8:162:51e2::2]:9001"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "109.163.234.8:80 orport=443 id=0818DAE0E2DDF795AEDEAC60B15E71901084F281"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "163.172.149.155:80 orport=443 id=0B85617241252517E8ECF2CFC7F4C1A32DCD153F"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "5.39.92.199:80 orport=443 id=0BEA4A88D069753218EAAAD6D22EA87B9A1319D6"
 " ipv6=[2001:41d0:8:b1c7::1]:443"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "178.62.197.82:80 orport=443 id=0D3EBA17E1C78F1E9900BABDB23861D46FCAF163"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "185.100.86.100:80 orport=443 id=0E8C0C8315B66DB5F703804B3889A1DD66C67CE0"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "95.85.8.226:80 orport=443 id=1211AC1BBB8A1AF7CBA86BCE8689AA3146B86423"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "193.11.114.43:9030 orport=9001 id=12AD30E5D25AA67F519780E2111E611A455FDC89"
 " ipv6=[2001:6b0:30:1000::99]:9050"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "37.157.195.87:8030 orport=443 id=12FD624EE73CEF37137C90D38B2406A66F68FAA2"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "178.16.208.59:80 orport=443 id=136F9299A5009A4E0E96494E723BDB556FB0A26B"
 " ipv6=[2a00:1c20:4089:1234:bff6:e1bb:1ce3:8dc6]:443"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "144.76.14.145:110 orport=143 id=14419131033443AE6E21DA82B0D307F7CAE42BDB"
 " ipv6=[2a01:4f8:190:9490::dead]:443"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "178.62.60.37:80 orport=443 id=175921396C7C426309AB03775A9930B6F611F794"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "204.11.50.131:9030 orport=9001 id=185F2A57B0C4620582602761097D17DB81654F70"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "5.9.158.75:80 orport=443 id=1AF72E8906E6C49481A791A6F8F84F8DFEBBB2BA"
 " ipv6=[2a01:4f8:190:514a::2]:443"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "46.101.151.222:80 orport=443 id=1DBAED235E3957DE1ABD25B4206BE71406FB61F8"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "91.219.237.229:80 orport=443 id=1ECD73B936CB6E6B3CD647CC204F108D9DF2C9F7"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "212.47.229.2:9030 orport=9001 id=20462CBA5DA4C2D963567D17D0B7249718114A68"
 " ipv6=[2001:bc8:4400:2100::f03]:9001"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "144.76.163.93:9030 orport=9001 id=22F08CF09764C4E8982640D77F71ED72FF26A9AC"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "163.172.176.167:80 orport=443 id=230A8B2A8BA861210D9B4BA97745AEC217A94207"
 /* nickname= */
 /* extrainfo=0 */
+/* = */
 ,
 "37.200.98.5:80 orport=443 id=231C2B9C8C31C295C472D031E06964834B745996"
 " ipv6=[2a00:1158:3::11a]:993"
 /* nickname= */
 /*

[tor-commits] [tor/master] Add a changes file for 22321, that mentions all its children and 24678

2018-01-05 Thread nickm

commit e3a2324083e370069a0caea1d07f7c58dc11c7af
Author: teor 
Date:   Fri Dec 29 20:22:46 2017 +1100

Add a changes file for 22321, that mentions all its children and 24678
---
 changes/ticket22321 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/ticket22321 b/changes/ticket22321
new file mode 100644
index 0..fcac1bccc
--- /dev/null
+++ b/changes/ticket22321
@@ -0,0 +1,3 @@
+  o Minor features (fallbacks):
+- Update the fallback whitelist and blacklist based on opt-ins and relay
+  changes. Closes tickets 22321, 24678, 22527, 24135, and 24695.



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

[tor-commits] [tor/master] Add a timestamp to the header of the current fallback list

2018-01-05 Thread nickm

commit ca1f808d938939b1bfb5ffed5124d3a32c7d1743
Author: teor 
Date:   Wed Dec 27 21:13:21 2017 +1100

Add a timestamp to the header of the current fallback list

This timestamp is based on the time that list was first committed.

Part of 24725.
---
 src/or/fallback_dirs.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc
index 912a8853c..2c8fe724a 100644
--- a/src/or/fallback_dirs.inc
+++ b/src/or/fallback_dirs.inc
@@ -1,5 +1,6 @@
 /* type=fallback */
 /* version=2.0.0 */
+/* timestamp=20170526090242 */
 /* = */
 /* Whitelist & blacklist excluded 1326 of 1513 candidates. */
 /* Checked IPv4 DirPorts served a consensus within 15.0s. */



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

[tor-commits] [tor/master] Add blank nicknames to the current fallback file

2018-01-05 Thread nickm

commit 067617608c6314e1ab92e219b247d89ed7ec9591
Author: teor 
Date:   Sat Dec 23 00:34:52 2017 +1100

Add blank nicknames to the current fallback file

Using this script:
sed -i.bak $'s|^,$|/* nickname= */\\\n,|' src/or/fallback_dirs.inc
(Due to embedded newlines, this script only works in bash.)

This allows us to check that the code compiles, and the unit tests pass.
And it allows downstream users stem and atlas to adapt to the new format.

The upcoming fallback rebuild will automatically generate this new format,
with actual relay nicknames.

Follow-up to 24600.
---
 src/or/fallback_dirs.inc | 151 +++
 1 file changed, 151 insertions(+)

diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc
index 397121b12..5624ad49f 100644
--- a/src/or/fallback_dirs.inc
+++ b/src/or/fallback_dirs.inc
@@ -17,356 +17,507 @@ Onionoo Source: uptime Date: 2017-05-16 07:00:00 Version: 
4.0
 URL: 
https:onionoo.torproject.orguptime?first_seen_days=30-=V2Dir=relay_seen_days=-0
 */
 "176.10.104.240:80 orport=443 id=0111BA9B604669E636FFD5B503F382A4B7AD6E80"
+/* nickname= */
 ,
 "193.171.202.146:9030 orport=9001 id=01A9258A46E97FF8B2CAC7910577862C14F2C524"
+/* nickname= */
 ,
 "185.100.85.61:80 orport=443 id=025B66CEBC070FCB0519D206CF0CF4965C20C96E"
+/* nickname= */
 ,
 "185.97.32.18:9030 orport=9001 id=04250C3835019B26AA6764E85D836088BE441088"
+/* nickname= */
 ,
 "5.9.110.236:9030 orport=9001 id=0756B7CD4DFC8182BE23143FAC0642F515182CEB"
 " ipv6=[2a01:4f8:162:51e2::2]:9001"
+/* nickname= */
 ,
 "109.163.234.8:80 orport=443 id=0818DAE0E2DDF795AEDEAC60B15E71901084F281"
+/* nickname= */
 ,
 "163.172.149.155:80 orport=443 id=0B85617241252517E8ECF2CFC7F4C1A32DCD153F"
+/* nickname= */
 ,
 "5.39.92.199:80 orport=443 id=0BEA4A88D069753218EAAAD6D22EA87B9A1319D6"
 " ipv6=[2001:41d0:8:b1c7::1]:443"
+/* nickname= */
 ,
 "178.62.197.82:80 orport=443 id=0D3EBA17E1C78F1E9900BABDB23861D46FCAF163"
+/* nickname= */
 ,
 "185.100.86.100:80 orport=443 id=0E8C0C8315B66DB5F703804B3889A1DD66C67CE0"
+/* nickname= */
 ,
 "95.85.8.226:80 orport=443 id=1211AC1BBB8A1AF7CBA86BCE8689AA3146B86423"
+/* nickname= */
 ,
 "193.11.114.43:9030 orport=9001 id=12AD30E5D25AA67F519780E2111E611A455FDC89"
 " ipv6=[2001:6b0:30:1000::99]:9050"
+/* nickname= */
 ,
 "37.157.195.87:8030 orport=443 id=12FD624EE73CEF37137C90D38B2406A66F68FAA2"
+/* nickname= */
 ,
 "178.16.208.59:80 orport=443 id=136F9299A5009A4E0E96494E723BDB556FB0A26B"
 " ipv6=[2a00:1c20:4089:1234:bff6:e1bb:1ce3:8dc6]:443"
+/* nickname= */
 ,
 "144.76.14.145:110 orport=143 id=14419131033443AE6E21DA82B0D307F7CAE42BDB"
 " ipv6=[2a01:4f8:190:9490::dead]:443"
+/* nickname= */
 ,
 "178.62.60.37:80 orport=443 id=175921396C7C426309AB03775A9930B6F611F794"
+/* nickname= */
 ,
 "204.11.50.131:9030 orport=9001 id=185F2A57B0C4620582602761097D17DB81654F70"
+/* nickname= */
 ,
 "5.9.158.75:80 orport=443 id=1AF72E8906E6C49481A791A6F8F84F8DFEBBB2BA"
 " ipv6=[2a01:4f8:190:514a::2]:443"
+/* nickname= */
 ,
 "46.101.151.222:80 orport=443 id=1DBAED235E3957DE1ABD25B4206BE71406FB61F8"
+/* nickname= */
 ,
 "91.219.237.229:80 orport=443 id=1ECD73B936CB6E6B3CD647CC204F108D9DF2C9F7"
+/* nickname= */
 ,
 "212.47.229.2:9030 orport=9001 id=20462CBA5DA4C2D963567D17D0B7249718114A68"
 " ipv6=[2001:bc8:4400:2100::f03]:9001"
+/* nickname= */
 ,
 "144.76.163.93:9030 orport=9001 id=22F08CF09764C4E8982640D77F71ED72FF26A9AC"
+/* nickname= */
 ,
 "163.172.176.167:80 orport=443 id=230A8B2A8BA861210D9B4BA97745AEC217A94207"
+/* nickname= */
 ,
 "37.200.98.5:80 orport=443 id=231C2B9C8C31C295C472D031E06964834B745996"
 " ipv6=[2a00:1158:3::11a]:993"
+/* nickname= */
 ,
 "212.47.240.10:82 orport=443 id=2A4C448784F5A83AFE6C78DA357D5E31F7989DEB"
+/* nickname= */
 ,
 "144.76.26.175:9012 orport=9011 id=2BA2C8E96B2590E1072AECE2BDB5C48921BF8510"
+/* nickname= */
 ,
 "97.74.237.196:9030 orport=9001 id=2F0F32AB1E5B943CA7D062C03F18960C86E70D94"
+/* nickname= */
 ,
 "107.170.101.39:9030 orport=443 id=30973217E70AF00EBE51797FF6D9AA720A902EAA"
+/* nickname= */
 ,
 "64.113.32.29:9030 orport=9001 id=30C19B81981F450C402306E2E7CFB6C3F79CB6B2"
+/* nickname= */
 ,
 "212.83.154.33:8080 orport=8443 id=322C6E3A973BC10FC36DE3037AD27BC89F14723B"
+/* nickname= */
 ,
 "109.105.109.162:52860 orport=60784 
id=32EE911D968BE3E016ECA572BB1ED0A9EE43FC2F"
 " ipv6=[2001:948:7:2::163]:5001"
+/* nickname= */
 ,
 "163.172.13.165:9030 orport=9001 id=33DA0CAB7C27812EFF2E22C9705630A54D101FEB"
 " ipv6=[2001:bc8:38cb:201::8]:9001"
+/* nickname= */
 ,
 "217.79.190.25:9030 orport=9090 id=361D33C96D0F161275EE67E2C91EE10B276E778B"
+/* nickname= */
 ,
 "37.187.22.87:9030 orport=9001 id=36B9E7AC1E36B62A9D6F330ABEB6012BA7F0D400"
 " ipv6=[2001:41d0:a:1657::1]:9001"
+/* nickname= */
 ,
 "62.210.92.11:9130 orport=9101 id=387B065A38E4DAA16D9D41C2964ECBC4B31D30FF"
 " ipv6=[2001:bc8:338c::1]:9101"
+/* nickname= */
 ,
 "198.50.191.95:80 orport=443

[tor-commits] [tor/master] Add all-zero extrainfo cache flags to the current fallback file

2018-01-05 Thread nickm

commit c1be0cfdb45d702afa3c1883a5e436cef8115fcd
Author: teor 
Date:   Sat Dec 23 01:24:48 2017 +1100

Add all-zero extrainfo cache flags to the current fallback file

Using this script:
sed -i.bak $'s|^,$|/* extrainfo=0 */\\\n,|' src/or/fallback_dirs.inc
(Due to embedded newlines, this script only works in bash.)

This allows us to check that the code compiles, and the unit tests pass.
And it allows downstream users stem and atlas to adapt to the new format.

The upcoming fallback rebuild will automatically generate this new format,
with actual relay extrainfo cache flags.

Follow-up to 22759.
---
 src/or/fallback_dirs.inc | 151 +++
 1 file changed, 151 insertions(+)

diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc
index 5624ad49f..b7a2a099f 100644
--- a/src/or/fallback_dirs.inc
+++ b/src/or/fallback_dirs.inc
@@ -18,506 +18,657 @@ URL: 
https:onionoo.torproject.orguptime?first_seen_days=30-=V2Dir=rela
 */
 "176.10.104.240:80 orport=443 id=0111BA9B604669E636FFD5B503F382A4B7AD6E80"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "193.171.202.146:9030 orport=9001 id=01A9258A46E97FF8B2CAC7910577862C14F2C524"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "185.100.85.61:80 orport=443 id=025B66CEBC070FCB0519D206CF0CF4965C20C96E"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "185.97.32.18:9030 orport=9001 id=04250C3835019B26AA6764E85D836088BE441088"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "5.9.110.236:9030 orport=9001 id=0756B7CD4DFC8182BE23143FAC0642F515182CEB"
 " ipv6=[2a01:4f8:162:51e2::2]:9001"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "109.163.234.8:80 orport=443 id=0818DAE0E2DDF795AEDEAC60B15E71901084F281"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "163.172.149.155:80 orport=443 id=0B85617241252517E8ECF2CFC7F4C1A32DCD153F"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "5.39.92.199:80 orport=443 id=0BEA4A88D069753218EAAAD6D22EA87B9A1319D6"
 " ipv6=[2001:41d0:8:b1c7::1]:443"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "178.62.197.82:80 orport=443 id=0D3EBA17E1C78F1E9900BABDB23861D46FCAF163"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "185.100.86.100:80 orport=443 id=0E8C0C8315B66DB5F703804B3889A1DD66C67CE0"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "95.85.8.226:80 orport=443 id=1211AC1BBB8A1AF7CBA86BCE8689AA3146B86423"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "193.11.114.43:9030 orport=9001 id=12AD30E5D25AA67F519780E2111E611A455FDC89"
 " ipv6=[2001:6b0:30:1000::99]:9050"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "37.157.195.87:8030 orport=443 id=12FD624EE73CEF37137C90D38B2406A66F68FAA2"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "178.16.208.59:80 orport=443 id=136F9299A5009A4E0E96494E723BDB556FB0A26B"
 " ipv6=[2a00:1c20:4089:1234:bff6:e1bb:1ce3:8dc6]:443"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "144.76.14.145:110 orport=143 id=14419131033443AE6E21DA82B0D307F7CAE42BDB"
 " ipv6=[2a01:4f8:190:9490::dead]:443"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "178.62.60.37:80 orport=443 id=175921396C7C426309AB03775A9930B6F611F794"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "204.11.50.131:9030 orport=9001 id=185F2A57B0C4620582602761097D17DB81654F70"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "5.9.158.75:80 orport=443 id=1AF72E8906E6C49481A791A6F8F84F8DFEBBB2BA"
 " ipv6=[2a01:4f8:190:514a::2]:443"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "46.101.151.222:80 orport=443 id=1DBAED235E3957DE1ABD25B4206BE71406FB61F8"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "91.219.237.229:80 orport=443 id=1ECD73B936CB6E6B3CD647CC204F108D9DF2C9F7"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "212.47.229.2:9030 orport=9001 id=20462CBA5DA4C2D963567D17D0B7249718114A68"
 " ipv6=[2001:bc8:4400:2100::f03]:9001"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "144.76.163.93:9030 orport=9001 id=22F08CF09764C4E8982640D77F71ED72FF26A9AC"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "163.172.176.167:80 orport=443 id=230A8B2A8BA861210D9B4BA97745AEC217A94207"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "37.200.98.5:80 orport=443 id=231C2B9C8C31C295C472D031E06964834B745996"
 " ipv6=[2a00:1158:3::11a]:993"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "212.47.240.10:82 orport=443 id=2A4C448784F5A83AFE6C78DA357D5E31F7989DEB"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "144.76.26.175:9012 orport=9011 id=2BA2C8E96B2590E1072AECE2BDB5C48921BF8510"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "97.74.237.196:9030 orport=9001 id=2F0F32AB1E5B943CA7D062C03F18960C86E70D94"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "107.170.101.39:9030 orport=443 id=30973217E70AF00EBE51797FF6D9AA720A902EAA"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "64.113.32.29:9030 orport=9001 id=30C19B81981F450C402306E2E7CFB6C3F79CB6B2"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "212.83.154.33:8080 orport=8443 id=322C6E3A973BC10FC36DE3037AD27BC89F14723B"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "109.105.109.162:52860 orport=60784 
id=32EE911D968BE3E016ECA572BB1ED0A9EE43FC2F"
 " ipv6=[2001:948:7:2::163]:5001"
 /* nickname= */
+/* extrainfo=0 */
 ,
 "163.172.13.165:9030

[tor-commits] [tor/master] Add fallback directory mirror helper scripts

2018-01-05 Thread nickm

commit e244738bbd7d0fb58bb17bcec071a0b7b71fd532
Author: teor 
Date:   Fri Dec 22 21:38:12 2017 +1100

Add fallback directory mirror helper scripts

Add the generateFallbackDirLine.py script for automatically generating
fallback directory mirror lines from relay fingerprints. No more typos!

Add the lookupFallbackDirContact.py script for automatically looking up
operator contact info from relay fingerprints.

Implements ticket 24706.
---
 changes/ticket24706   |  6 +
 scripts/maint/fallback.blacklist  |  2 ++
 scripts/maint/fallback.whitelist  |  2 ++
 scripts/maint/generateFallbackDirLine.py  | 41 +++
 scripts/maint/lookupFallbackDirContact.py | 28 +
 5 files changed, 79 insertions(+)

diff --git a/changes/ticket24706 b/changes/ticket24706
new file mode 100644
index 0..716f88c89
--- /dev/null
+++ b/changes/ticket24706
@@ -0,0 +1,6 @@
+  o Minor features (fallback directory mirrors):
+- Add the generateFallbackDirLine.py script for automatically generating
+  fallback directory mirror lines from relay fingerprints. No more typos!
+  Add the lookupFallbackDirContact.py script for automatically looking up
+  operator contact info from relay fingerprints.
+  Implements ticket 24706.
diff --git a/scripts/maint/fallback.blacklist b/scripts/maint/fallback.blacklist
index 1d0edfd0b..a118cb591 100644
--- a/scripts/maint/fallback.blacklist
+++ b/scripts/maint/fallback.blacklist
@@ -3,6 +3,8 @@
 # Format:
 # [ IPv4[:DirPort] ] [ orport= ] [ id= ] ...
 #   [ ipv6=[:] ]
+# or use:
+# scripts/maint/generateFallbackDirLine.py fingerprint ...
 #
 # If a sufficiently specific group of attributes matches, the directory mirror
 # will be excluded: (each group is listed on its own line)
diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist
index b8bb82fd0..e9158e128 100644
--- a/scripts/maint/fallback.whitelist
+++ b/scripts/maint/fallback.whitelist
@@ -2,6 +2,8 @@
 #
 # Format:
 # IPv4:DirPort orport= id= [ ipv6=: ]
+# or use:
+# scripts/maint/generateFallbackDirLine.py fingerprint ...
 #
 # All attributes must match for the directory mirror to be included.
 # If the fallback has an ipv6 key, the whitelist line must also have
diff --git a/scripts/maint/generateFallbackDirLine.py 
b/scripts/maint/generateFallbackDirLine.py
new file mode 100755
index 0..b59edc33f
--- /dev/null
+++ b/scripts/maint/generateFallbackDirLine.py
@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+
+# Generate a fallback directory whitelist/blacklist line for every fingerprint
+# passed as an argument.
+#
+# Usage:
+# generateFallbackDirLine.py fingerprint ...
+
+import sys
+
+import stem.descriptor.remote as remote
+
+if len(sys.argv) <= 1:
+  print "Usage: {} fingerprint ...".format(sys.argv[0])
+  sys.exit(-1)
+
+# we need the full consensus, because it has IPv6 ORPorts
+# and we want a fingerprint to router mapping in routers
+#
+# stem returns document_handler='DOCUMENT' as a list of consensuses
+# with one entry
+consensus = remote.get_consensus(document_handler='DOCUMENT').run()[0]
+
+for fingerprint in sys.argv[1:]:
+  if fingerprint in consensus.routers:
+r = consensus.routers[fingerprint]
+# Tor clients don't use DirPorts, but old code requires one for fallbacks
+if r.dir_port is not None:
+  # IPv4:DirPort orport=ORPort id=Fingerprint ipv6=[IPv6]:IPv6ORPort # nick
+  ipv6_or_ap_list = [ apv for apv in r.or_addresses if apv[2] ]
+  ipv6_str = ""
+  if len(ipv6_or_ap_list) > 0:
+ipv6_or_ap = ipv6_or_ap_list[0]
+ipv6_str = " ipv6=[{}]:{}".format(ipv6_or_ap[0], ipv6_or_ap[1])
+  print ("{}:{} orport={} id={}{} # {}"
+ .format(r.address, r.dir_port, r.or_port, r.fingerprint,
+ ipv6_str, r.nickname))
+else:
+  print "# {} needs a DirPort".format(fingerprint)
+  else:
+print "# {} not found in current consensus".format(fingerprint)
diff --git a/scripts/maint/lookupFallbackDirContact.py 
b/scripts/maint/lookupFallbackDirContact.py
new file mode 100755
index 0..14c53d128
--- /dev/null
+++ b/scripts/maint/lookupFallbackDirContact.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+
+# Lookup fallback directory contact lines for every fingerprint passed as an
+# argument.
+#
+# Usage:
+# lookupFallbackDirContact.py fingerprint ...
+
+import sys
+
+import stem.descriptor.remote as remote
+
+if len(sys.argv) <= 1:
+  print "Usage: {} fingerprint ...".format(sys.argv[0])
+  sys.exit(-1)
+
+# we need descriptors, because the consensus does not have contact infos
+descriptor_list = 
remote.get_server_descriptors(fingerprints=sys.argv[1:]).run()
+
+descriptor_list_fingerprints = []
+for d in descriptor_list:
+  assert d.fingerprint in sys.argv[1:]
+  descriptor_list_fingerprints.append(d.fingerprint)
+  print "{} {}".format(d.fingerprint, d.contact)
+
+for fingerprint

[tor-commits] [tor/master] Some fallbacks changed their details: assume the changes are permanent

2018-01-05 Thread nickm

commit a9c0be62a953211553f3c453d62af08f128d0252
Author: teor 
Date:   Thu Jan 4 09:42:31 2018 +1100

Some fallbacks changed their details: assume the changes are permanent

We have already updated the details for operators who replied to:
https://lists.torproject.org/pipermail/tor-relays/2017-December/013988.html

Closes #24678.
---
 scripts/maint/fallback.whitelist | 24 +++-
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist
index 7df2dc2d8..f2f0acd1c 100644
--- a/scripts/maint/fallback.whitelist
+++ b/scripts/maint/fallback.whitelist
@@ -153,9 +153,10 @@
 109.163.234.8:80 orport=443 id=0818DAE0E2DDF795AEDEAC60B15E71901084F281
 109.163.234.9:80 orport=443 id=ABF7FBF389C9A747938B639B20E80620B460B2A9
 62.102.148.67:80 orport=443 id=4A0C3E177AF684581EF780981AEAF51A98A6B5CF
-77.247.181.162:80 orport=443 id=7BB160A8F54BD74F3DA5F2CE701E8772B841859D
-77.247.181.164:80 orport=443 id=10E13E340651D0EF66B4DEBF610B3C0981168107
-77.247.181.166:80 orport=443 id=06E123865C590189B3181114F23F0F13A7BC0E69
+# Assume details update is permanent
+77.247.181.166:80 orport=443 id=77131D7E2EC1CA9B8D737502256DA9103599CE51 # 
CriticalMass
+77.247.181.164:80 orport=443 id=204DFD2A2C6A0DC1FA0EACB495218E0B661704FD # 
HaveHeart
+77.247.181.162:80 orport=443 id=7BFB908A3AA5B491DA4CA72CCBEE0E1F2A939B55 # 
sofia
 
 # https://twitter.com/biotimylated/status/718994247500718080
 212.47.252.149:9030 orport=9001 id=2CAC39BAA996791CEFAADC9D4754D65AF5EB77C0
@@ -207,8 +208,9 @@
 # Email sent directly to teor, verified using relay contact info
 89.187.142.208:80 orport=443 id=64186650FFE4469EBBE52B644AE543864D32F43C
 
-# Email sent directly to teor, verified using relay contact info
-212.51.134.123:9030 orport=9001 id=50586E25BE067FD1F739998550EDDCB1A14CA5B2 
ipv6=[2a02:168:6e00:0:3a60:77ff:fe9c:8bd1]:9001
+# Email sent directly to teor
+# Assume details update is permanent
+212.51.134.123:9030 orport=9001 id=50586E25BE067FD1F739998550EDDCB1A14CA5B2 # 
Jans
 
 # Email sent directly to teor, verified using relay contact info
 46.101.143.173:80 orport=443 id=F960DF50F0FD4075AC9B505C1D4FFC8384C490FB
@@ -217,7 +219,8 @@
 193.171.202.146:9030 orport=9001 id=01A9258A46E97FF8B2CAC7910577862C14F2C524
 
 # Email sent directly to teor, verified using relay contact info
-197.231.221.211:9030 orport=9001 id=BC630CBBB518BE7E9F4E09712AB0269E9DC7D626
+# Assume details update is permanent
+197.231.221.211:9030 orport=443 id=BC630CBBB518BE7E9F4E09712AB0269E9DC7D626 # 
IPredator
 
 # Email sent directly to teor, verified using relay contact info
 185.61.138.18:8080 orport=4443 id=2541759BEC04D37811C2209A88E863320271EC9C
@@ -569,7 +572,8 @@
 167.114.113.48:9030 orport=403 id=2EC0C66EA700C44670444280AABAB1EC78B722A0
 
 # Email sent directly to teor, verified using relay contact info
-79.120.16.42:9030 orport=9001 id=BD552C165E2ED2887D3F1CCE9CFF155DDA2D86E6
+# Assume details update is permanent
+213.141.138.174:9030 orport=9001 id=BD552C165E2ED2887D3F1CCE9CFF155DDA2D86E6 # 
Schakalium
 
 # Email sent directly to teor, verified using relay contact info
 95.128.43.164:80 orport=443 id=616081EC829593AF4232550DE6FFAA1D75B37A90 
ipv6=[2a02:ec0:209:10::4]:443
@@ -672,7 +676,8 @@
 213.239.217.18:1338 orport=1337 id=C37BC191AC389179674578C3E6944E925FE186C2 
ipv6=[2a01:4f8:a0:746a:101:1:1:1]:1337
 
 # Email sent directly to teor, verified using relay contact info
-188.40.128.246:9030 orport=9001 id=AD19490C7DBB26D3A68EFC824F67E69B0A96E601
+# Assume details update is permanent
+188.40.128.246:9030 orport=9001 id=AD19490C7DBB26D3A68EFC824F67E69B0A96E601 
ipv6=[2a01:4f8:221:1ac1:dead:beef:7005:9001]:9001 # sputnik
 
 # Email sent directly to teor, verified using relay contact info
 88.198.253.13:9030 orport=9001 id=DF924196D69AAE3C00C115A9CCDF7BB62A175310 
ipv6=[2a01:4f8:11a:b1f::2]:9001
@@ -843,7 +848,8 @@
 5.9.159.14:9030 orport=9001 id=0F100F60C7A63BED90216052324D29B08CFCF797
 
 # Email sent directly to teor, verified using relay contact info
-5.9.147.226:9030 orport=9001 id=B0553175AADB0501E5A61FC61CEA3970BE130FF2
+# Assume details update is permanent
+5.9.147.226:9030 orport=9001 id=B0553175AADB0501E5A61FC61CEA3970BE130FF2 
ipv6=[2a01:4f8:190:30e1::2]:9001 # zwiubel
 
 # https://trac.torproject.org/projects/tor/ticket/22527#comment:1
 199.184.246.250:80 orport=443 id=1F6ABD086F40B890A33C93CC4606EE68B31C9556 
ipv6=[2620:124:1009:1::171]:443



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

[tor-commits] [tor/master] Adjust fallback selection parameters

2018-01-05 Thread nickm

commit d30d3fe8ed4b88c070736b22e2de16dcfe9a1b80
Author: teor 
Date:   Fri Jan 5 00:08:11 2018 +1100

Adjust fallback selection parameters

Avoid selecting fallbacks that change their IP addresses too often.

Select more fallbacks by ignoring the Guard flag, and allowing lower
cutoffs for the Running and V2Dir flags. Also allow a lower bandwidth,
and a higher number of fallbacks per operator (5% of the list).

Implements ticket 24785.
---
 changes/ticket24785 |  6 +
 scripts/maint/updateFallbackDirs.py | 49 +++--
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/changes/ticket24785 b/changes/ticket24785
new file mode 100644
index 0..39667cb8d
--- /dev/null
+++ b/changes/ticket24785
@@ -0,0 +1,6 @@
+  o Minor features (fallbacks):
+- Avoid selecting fallbacks that change their IP addresses too often.
+  Select more fallbacks by ignoring the Guard flag, and allowing lower
+  cutoffs for the Running and V2Dir flags. Also allow a lower bandwidth,
+  and a higher number of fallbacks per operator (5% of the list).
+  Implements ticket 24785.
diff --git a/scripts/maint/updateFallbackDirs.py 
b/scripts/maint/updateFallbackDirs.py
index fafc4f129..9f44bc097 100755
--- a/scripts/maint/updateFallbackDirs.py
+++ b/scripts/maint/updateFallbackDirs.py
@@ -170,25 +170,30 @@ MAX_LIST_FILE_SIZE = 1024 * 1024
 
 # Require fallbacks to have the same address and port for a set amount of time
 # We used to have this at 1 week, but that caused many fallback failures, which
-# meant that we had to rebuild the list more often.
+# meant that we had to rebuild the list more often. We want fallbacks to be
+# stable for 2 years, so we set it to a few months.
 #
 # There was a bug in Tor 0.2.8.1-alpha and earlier where a relay temporarily
 # submits a 0 DirPort when restarted.
 # This causes OnionOO to (correctly) reset its stability timer.
-# Affected relays should upgrade to Tor 0.2.8.7 or later, which has a fix
+# Affected relays should upgrade to Tor 0.2.9 or later, which has a fix
 # for this issue.
-ADDRESS_AND_PORT_STABLE_DAYS = 30
+#
+# If a relay changes address or port, that's it, it's not useful any more,
+# because clients can't find it
+ADDRESS_AND_PORT_STABLE_DAYS = 90
 # We ignore relays that have been down for more than this period
 MAX_DOWNTIME_DAYS = 0 if MUST_BE_RUNNING_NOW else 7
-# What time-weighted-fraction of these flags must FallbackDirs
-# Equal or Exceed?
-CUTOFF_RUNNING = .90
-CUTOFF_V2DIR = .90
-# Tolerate lower guard flag averages, as guard flags are removed for some time
-# after a relay restarts
-CUTOFF_GUARD = .80
-# What time-weighted-fraction of these flags must FallbackDirs
-# Equal or Fall Under?
+# FallbackDirs must have a time-weighted-fraction that is greater than or
+# equal to:
+# Mirrors that are down half the time are still useful half the time
+CUTOFF_RUNNING = .50
+CUTOFF_V2DIR = .50
+# Guard flags are removed for some time after a relay restarts, so we ignore
+# the guard flag.
+CUTOFF_GUARD = .00
+# FallbackDirs must have a time-weighted-fraction that is less than or equal
+# to:
 # .00 means no bad exits
 PERMITTED_BADEXIT = .00
 
@@ -211,13 +216,19 @@ MAX_FALLBACK_COUNT = None if OUTPUT_CANDIDATES else 200
 MIN_FALLBACK_COUNT = 0 if OUTPUT_CANDIDATES else MAX_FALLBACK_COUNT*0.5
 
 # The maximum number of fallbacks on the same address, contact, or family
-# With 200 fallbacks, this means each operator can see 1% of client bootstraps
-# (The directory authorities used to see ~12% of client bootstraps each.)
+#
+# With 150 fallbacks, this means each operator sees 5% of client bootstraps.
+# For comparison:
+#  - We try to limit guard and exit operators to 5% of the network
+#  - The directory authorities used to see 11% of client bootstraps each
+#
+# We also don't want too much of the list to go down if a single operator
+# has to move all their relays.
 MAX_FALLBACKS_PER_IP = 1
 MAX_FALLBACKS_PER_IPV4 = MAX_FALLBACKS_PER_IP
 MAX_FALLBACKS_PER_IPV6 = MAX_FALLBACKS_PER_IP
-MAX_FALLBACKS_PER_CONTACT = 3
-MAX_FALLBACKS_PER_FAMILY = 3
+MAX_FALLBACKS_PER_CONTACT = 7
+MAX_FALLBACKS_PER_FAMILY = 7
 
 ## Fallback Bandwidth Requirements
 
@@ -229,11 +240,11 @@ EXIT_BANDWIDTH_FRACTION = 1.0
 
 # If a single fallback's bandwidth is too low, it's pointless adding it
 # We expect fallbacks to handle an extra 10 kilobytes per second of traffic
-# Make sure they can support a hundred times the expected extra load
-# (Use 102.4 to make it come out nicely in MByte/s)
+# Make sure they can support fifty times the expected extra load
+#
 # We convert this to a consensus weight before applying the filter,
 # because all the bandwidth amounts are specified by the relay
-MIN_BANDWIDTH = 102.4 * 10.0 * 1024.0
+MIN_BANDWIDTH = 50.0 * 10.0 * 1024.0
 
 # Clients will time out after 30 seconds trying to download a consensus
 # So allow fallback directories half

[tor-commits] [tor/master] Set CONSENSUS_EXPIRY_TOLERANCE to 0

2018-01-05 Thread nickm

commit 23979d76828a0610140ab8cf43572f8c744d571f
Author: Dominique Ingoglia 
Date:   Tue Dec 19 16:48:59 2017 -0700

Set CONSENSUS_EXPIRY_TOLERANCE to 0
---
 scripts/maint/updateFallbackDirs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/maint/updateFallbackDirs.py 
b/scripts/maint/updateFallbackDirs.py
index 3efd408ec..8ca5a7296 100755
--- a/scripts/maint/updateFallbackDirs.py
+++ b/scripts/maint/updateFallbackDirs.py
@@ -102,7 +102,7 @@ DOWNLOAD_MICRODESC_CONSENSUS = True
 # 0.3.0.0-alpha-dev and later deliver stale consensuses, but typically recover
 # after ~12 hours.
 # We should make this lower when #20909 is fixed, see #20942.
-CONSENSUS_EXPIRY_TOLERANCE = 24*60*60
+CONSENSUS_EXPIRY_TOLERANCE = 0 
 
 # Output fallback name, flags, bandwidth, and ContactInfo in a C comment?
 OUTPUT_COMMENTS = True if OUTPUT_CANDIDATES else False



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

[tor-commits] [tor/master] Add a generated timestamp to the fallback directory header

2018-01-05 Thread nickm

commit 9864fcd4e30e9afa2fa7a8bc25cf8399432a5796
Author: teor 
Date:   Wed Dec 27 21:10:46 2017 +1100

Add a generated timestamp to the fallback directory header

This can act as a revision counter, as requested by atagar in 24742.

Part of 24725.
---
 scripts/maint/updateFallbackDirs.py | 4 
 1 file changed, 4 insertions(+)

diff --git a/scripts/maint/updateFallbackDirs.py 
b/scripts/maint/updateFallbackDirs.py
index 54b50c377..4c0a30a5e 100755
--- a/scripts/maint/updateFallbackDirs.py
+++ b/scripts/maint/updateFallbackDirs.py
@@ -2217,6 +2217,10 @@ def list_fallbacks(whitelist, blacklist):
   print "/* type=fallback */"
   print ("/* version={} */"
  .format(cleanse_c_multiline_comment(FALLBACK_FORMAT_VERSION)))
+  now = datetime.datetime.utcnow()
+  timestamp = now.strftime('%Y%m%d%H%M%S')
+  print ("/* timestamp={} */"
+ .format(cleanse_c_multiline_comment(timestamp)))
   # end the header with a separator, to make it easier for parsers
   print SECTION_SEPARATOR_COMMENT
 



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

[tor-commits] [tor/master] Remove weights from the current fallback file

2018-01-05 Thread nickm

commit 384a450a472818ff13b18b971c92f7a52ca71ac9
Author: teor 
Date:   Fri Dec 22 23:26:14 2017 +1100

Remove weights from the current fallback file

Using this script:
sed -i.bak 's/" weight=10",/,/' src/or/fallback_dirs.inc

This allows us to check that the code compiles, and the unit tests pass.
And it allows downstream users stem and atlas to adapt to the new format.

The upcoming fallback rebuild will automatically generate this new format.

Follow-up to 24679.
---
 src/or/fallback_dirs.inc | 302 +++
 1 file changed, 151 insertions(+), 151 deletions(-)

diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc
index 72f8d520c..397121b12 100644
--- a/src/or/fallback_dirs.inc
+++ b/src/or/fallback_dirs.inc
@@ -17,356 +17,356 @@ Onionoo Source: uptime Date: 2017-05-16 07:00:00 Version: 
4.0
 URL: 
https:onionoo.torproject.orguptime?first_seen_days=30-=V2Dir=relay_seen_days=-0
 */
 "176.10.104.240:80 orport=443 id=0111BA9B604669E636FFD5B503F382A4B7AD6E80"
-" weight=10",
+,
 "193.171.202.146:9030 orport=9001 id=01A9258A46E97FF8B2CAC7910577862C14F2C524"
-" weight=10",
+,
 "185.100.85.61:80 orport=443 id=025B66CEBC070FCB0519D206CF0CF4965C20C96E"
-" weight=10",
+,
 "185.97.32.18:9030 orport=9001 id=04250C3835019B26AA6764E85D836088BE441088"
-" weight=10",
+,
 "5.9.110.236:9030 orport=9001 id=0756B7CD4DFC8182BE23143FAC0642F515182CEB"
 " ipv6=[2a01:4f8:162:51e2::2]:9001"
-" weight=10",
+,
 "109.163.234.8:80 orport=443 id=0818DAE0E2DDF795AEDEAC60B15E71901084F281"
-" weight=10",
+,
 "163.172.149.155:80 orport=443 id=0B85617241252517E8ECF2CFC7F4C1A32DCD153F"
-" weight=10",
+,
 "5.39.92.199:80 orport=443 id=0BEA4A88D069753218EAAAD6D22EA87B9A1319D6"
 " ipv6=[2001:41d0:8:b1c7::1]:443"
-" weight=10",
+,
 "178.62.197.82:80 orport=443 id=0D3EBA17E1C78F1E9900BABDB23861D46FCAF163"
-" weight=10",
+,
 "185.100.86.100:80 orport=443 id=0E8C0C8315B66DB5F703804B3889A1DD66C67CE0"
-" weight=10",
+,
 "95.85.8.226:80 orport=443 id=1211AC1BBB8A1AF7CBA86BCE8689AA3146B86423"
-" weight=10",
+,
 "193.11.114.43:9030 orport=9001 id=12AD30E5D25AA67F519780E2111E611A455FDC89"
 " ipv6=[2001:6b0:30:1000::99]:9050"
-" weight=10",
+,
 "37.157.195.87:8030 orport=443 id=12FD624EE73CEF37137C90D38B2406A66F68FAA2"
-" weight=10",
+,
 "178.16.208.59:80 orport=443 id=136F9299A5009A4E0E96494E723BDB556FB0A26B"
 " ipv6=[2a00:1c20:4089:1234:bff6:e1bb:1ce3:8dc6]:443"
-" weight=10",
+,
 "144.76.14.145:110 orport=143 id=14419131033443AE6E21DA82B0D307F7CAE42BDB"
 " ipv6=[2a01:4f8:190:9490::dead]:443"
-" weight=10",
+,
 "178.62.60.37:80 orport=443 id=175921396C7C426309AB03775A9930B6F611F794"
-" weight=10",
+,
 "204.11.50.131:9030 orport=9001 id=185F2A57B0C4620582602761097D17DB81654F70"
-" weight=10",
+,
 "5.9.158.75:80 orport=443 id=1AF72E8906E6C49481A791A6F8F84F8DFEBBB2BA"
 " ipv6=[2a01:4f8:190:514a::2]:443"
-" weight=10",
+,
 "46.101.151.222:80 orport=443 id=1DBAED235E3957DE1ABD25B4206BE71406FB61F8"
-" weight=10",
+,
 "91.219.237.229:80 orport=443 id=1ECD73B936CB6E6B3CD647CC204F108D9DF2C9F7"
-" weight=10",
+,
 "212.47.229.2:9030 orport=9001 id=20462CBA5DA4C2D963567D17D0B7249718114A68"
 " ipv6=[2001:bc8:4400:2100::f03]:9001"
-" weight=10",
+,
 "144.76.163.93:9030 orport=9001 id=22F08CF09764C4E8982640D77F71ED72FF26A9AC"
-" weight=10",
+,
 "163.172.176.167:80 orport=443 id=230A8B2A8BA861210D9B4BA97745AEC217A94207"
-" weight=10",
+,
 "37.200.98.5:80 orport=443 id=231C2B9C8C31C295C472D031E06964834B745996"
 " ipv6=[2a00:1158:3::11a]:993"
-" weight=10",
+,
 "212.47.240.10:82 orport=443 id=2A4C448784F5A83AFE6C78DA357D5E31F7989DEB"
-" weight=10",
+,
 "144.76.26.175:9012 orport=9011 id=2BA2C8E96B2590E1072AECE2BDB5C48921BF8510"
-" weight=10",
+,
 "97.74.237.196:9030 orport=9001 id=2F0F32AB1E5B943CA7D062C03F18960C86E70D94"
-" weight=10",
+,
 "107.170.101.39:9030 orport=443 id=30973217E70AF00EBE51797FF6D9AA720A902EAA"
-" weight=10",
+,
 "64.113.32.29:9030 orport=9001 id=30C19B81981F450C402306E2E7CFB6C3F79CB6B2"
-" weight=10",
+,
 "212.83.154.33:8080 orport=8443 id=322C6E3A973BC10FC36DE3037AD27BC89F14723B"
-" weight=10",
+,
 "109.105.109.162:52860 orport=60784 
id=32EE911D968BE3E016ECA572BB1ED0A9EE43FC2F"
 " ipv6=[2001:948:7:2::163]:5001"
-" weight=10",
+,
 "163.172.13.165:9030 orport=9001 id=33DA0CAB7C27812EFF2E22C9705630A54D101FEB"
 " ipv6=[2001:bc8:38cb:201::8]:9001"
-" weight=10",
+,
 "217.79.190.25:9030 orport=9090 id=361D33C96D0F161275EE67E2C91EE10B276E778B"
-" weight=10",
+,
 "37.187.22.87:9030 orport=9001 id=36B9E7AC1E36B62A9D6F330ABEB6012BA7F0D400"
 " ipv6=[2001:41d0:a:1657::1]:9001"
-" weight=10",
+,
 "62.210.92.11:9130 orport=9101 id=387B065A38E4DAA16D9D41C2964ECBC4B31D30FF"
 " ipv6=[2001:bc8:338c::1]:9101"
-" weight=10",
+,
 "198.50.191.95:80 orport=443 id=39F096961ED2576975C866D450373A9913AFDC92"
-" weight=10",
+,
 "164.132.77.175:9030 orport=9001 id=3B33F6FCA645AD4E91428A3AF7DC736AD9FB727B"
-" weight=10",
+,
 "212.47.230.49:9030 orport=9001

[tor-commits] [tor/master] Update fallback whitelist and blacklist based on 2017 changes

2018-01-05 Thread nickm

commit 90fd4566adc7b0129d0b794fb128c786ade7e24b
Author: Matt Traudt 
Date:   Tue Dec 19 18:27:25 2017 -0500

Update fallback whitelist and blacklist based on 2017 changes

This covers #22321 comments 3-14, including some child tickets.

Part of #22321. Patch by pastly.
---
 scripts/maint/fallback.blacklist |  3 ---
 scripts/maint/fallback.whitelist | 35 ++-
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/scripts/maint/fallback.blacklist b/scripts/maint/fallback.blacklist
index 1417a13a9..84aa7abe8 100644
--- a/scripts/maint/fallback.blacklist
+++ b/scripts/maint/fallback.blacklist
@@ -75,9 +75,6 @@
 185.21.216.140:9030 orport=9001 id=921DA852C95141F8964B359F774B35502E489869
 
 # Email sent directly to teor, verified using relay contact info
-62.210.82.44:143 orport=21 id=1C90D3AEADFF3BCD079810632C8B85637924A58E 
ipv6=[2001:bc8:3d7c::]:21
-
-# Email sent directly to teor, verified using relay contact info
 46.101.220.161:80 orport=443 id=7DDFE5B2C306B19A79832FBE581EAA245BAE90C6 
ipv6=[2a03:b0c0:3:d0::8b:3001]:443
 
 # Email sent directly to teor, verified using relay contact info
diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist
index 0620d6b5f..6c1504780 100644
--- a/scripts/maint/fallback.whitelist
+++ b/scripts/maint/fallback.whitelist
@@ -28,8 +28,9 @@
 # : orport= id= [ ipv6=: ]
 
 # https://lists.torproject.org/pipermail/tor-relays/2015-December/008362.html
-78.47.18.110:443 orport=80 id=F8D27B163B9247B232A2EEE68DD8B698695C28DE
-131.188.40.188:443 orport=80 id=EBE718E1A49EE229071702964F8DB1F318075FF8
+# https://trac.torproject.org/projects/tor/ticket/22321#comment:22
+78.47.18.110:443 orport=80 id=F8D27B163B9247B232A2EEE68DD8B698695C28DE 
ipv6=[2a01:4f8:120:4023::110]:80 # fluxe3
+131.188.40.188:443 orport=80 id=EBE718E1A49EE229071702964F8DB1F318075FF8 
ipv6=[2001:638:a000:4140:::188]:80
 
 # https://lists.torproject.org/pipermail/tor-relays/2015-December/008366.html
 5.39.88.19:9030 orport=9001 id=7CB8C31432A796731EA7B6BF4025548DFEB25E0C 
ipv6=[2001:41d0:8:9a13::1]:9050
@@ -52,8 +53,8 @@
 
 # https://lists.torproject.org/pipermail/tor-relays/2015-December/008379.html
 # Email sent directly to teor, verified using relay contact info
-91.121.84.137:4951 orport=4051 id=6DE61A6F72C1E5418A66BFED80DFB63E4C77668F 
ipv6=[2001:41d0:1:8989::1]:4051
-91.121.84.137:4952 orport=4052 id=9FBEB75E8BC142565F12CBBE078D63310236A334 
ipv6=[2001:41d0:1:8989::1]:4052
+91.121.84.137:4951 orport=4051 id=6DE61A6F72C1E5418A66BFED80DFB63E4C77668F
+91.121.84.137:4952 orport=4052 id=9FBEB75E8BC142565F12CBBE078D63310236A334
 
 # https://lists.torproject.org/pipermail/tor-relays/2015-December/008381.html
 # Sent additional email to teor with more relays
@@ -61,7 +62,6 @@
 178.254.20.134:80 orport=443 id=9F5068310818ED7C70B0BC4087AB55CB12CB4377
 178.254.20.134:9030 orport=9001 id=2CE96A8A1DA032664C90F574AFFBECE18A6E8DFC
 178.254.44.135:80 orport=443 id=AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2
-178.254.13.126:80 orport=443 id=F9246DEF2B653807236DA134F2AEAB103D58ABFE
 178.254.13.126:9030 orport=9001 id=0C475BA4D3AA3C289B716F95954CAD616E50C4E5
 
 # https://lists.torproject.org/pipermail/tor-relays/2015-December/008382.html
@@ -97,10 +97,7 @@
 # Email sent directly to teor, verified using relay contact info
 171.25.193.77:80 orport=443 id=A10C4F666D27364036B562823E5830BC448E046A 
ipv6=[2001:67c:289c:3::77]:443
 171.25.193.78:80 orport=443 id=A478E421F83194C114F41E94F95999672AED51FE 
ipv6=[2001:67c:289c:3::78]:443
-171.25.193.131:80 orport=443 id=79861CF8522FC637EF046F7688F5289E49D94576
 171.25.193.20:80 orport=443 id=DD8BD7307017407FCC36F8D04A688F74A0774C02 
ipv6=[2001:67c:289c::20]:443
-# OK, but same machine as 79861CF8522FC637EF046F7688F5289E49D94576
-#171.25.193.132:80 orport=443 id=01C67E0CA8F97111E652C7564CB3204361FFFAB8
 # OK, but same machine as DD8BD7307017407FCC36F8D04A688F74A0774C02
 #171.25.193.25:80 orport=443 id=185663B7C12777F052B2C2D23D7A239D8DA88A0F 
ipv6=[2001:67c:289c::25]:443
 
@@ -212,9 +209,6 @@
 46.101.143.173:80 orport=443 id=F960DF50F0FD4075AC9B505C1D4FFC8384C490FB
 
 # Email sent directly to teor, verified using relay contact info
-217.79.190.25:9030 orport=9090 id=361D33C96D0F161275EE67E2C91EE10B276E778B
-
-# Email sent directly to teor, verified using relay contact info
 193.171.202.146:9030 orport=9001 id=01A9258A46E97FF8B2CAC7910577862C14F2C524
 
 # Email sent directly to teor, verified using relay contact info
@@ -229,7 +223,7 @@
 193.11.114.46:9032 orport=9003 id=B83DC1558F0D34353BB992EF93AFEAFDB226A73E
 
 # Email sent directly to teor, verified using relay contact info
-144.76.26.175:9012 orport=9011 id=2BA2C8E96B2590E1072AECE2BDB5C48921BF8510
+138.201.250.33:9012 orport=9011 id=2BA2C8E96B2590E1072AECE2BDB5C48921BF8510
 
 # Email sent directly to teor, verified using relay contact info
 37.221.162.226:9030 orport=9001 id=D64366987CB39F61AD21DBCF8142FA0577B92811
@@ -247,7 +241,7 @@

[tor-commits] [tor/master] Add a type and version header to the fallback directory mirror file

2018-01-05 Thread nickm

commit 8d226a2c7b78dc1db998cb6ba075c0170b7cc521
Author: teor 
Date:   Sun Dec 24 11:36:45 2017 +1100

Add a type and version header to the fallback directory mirror file

This helps external parsers like stem and Relay Search.

Implements ticket 24725.
---
 changes/ticket24725 |  4 
 scripts/maint/updateFallbackDirs.py | 12 
 2 files changed, 16 insertions(+)

diff --git a/changes/ticket24725 b/changes/ticket24725
new file mode 100644
index 0..2fe1848ab
--- /dev/null
+++ b/changes/ticket24725
@@ -0,0 +1,4 @@
+  o Minor features (fallback directory mirrors):
+- Add a type and version header to the fallback directory mirror file.
+  This helps external parsers like stem and Relay Search.
+  Implements ticket 24725.
diff --git a/scripts/maint/updateFallbackDirs.py 
b/scripts/maint/updateFallbackDirs.py
index cf96fc308..7869d942c 100755
--- a/scripts/maint/updateFallbackDirs.py
+++ b/scripts/maint/updateFallbackDirs.py
@@ -68,6 +68,15 @@ except ImportError:
 
 ## Top-Level Configuration
 
+# We use semantic versioning: https://semver.org
+# In particular:
+# * major changes include removing a mandatory field, or anything else that
+#   would break an appropriately tolerant parser,
+# * minor changes include adding a field,
+# * patch changes include changing header comments or other unstructured
+#   content
+FALLBACK_FORMAT_VERSION = '2.0.0'
+
 # Output all candidate fallbacks, or only output selected fallbacks?
 OUTPUT_CANDIDATES = False
 
@@ -2124,6 +2133,9 @@ def list_fallbacks(whitelist, blacklist):
   """ Fetches required onionoo documents and evaluates the
   fallback directory criteria for each of the relays """
 
+  print "/* type=fallback */"
+  print ("/* version={} */"
+ .format(cleanse_c_multiline_comment(FALLBACK_FORMAT_VERSION)))
   logging.warning('Downloading and parsing Onionoo data. ' +
   'This may take some time.')
   # find relays that could be fallbacks



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

[tor-commits] [tor/master] Stop refusing fallbacks on the same machine

2018-01-05 Thread nickm

commit 5045dde956ec4647cbef5bd0fe81a05f3444012b
Author: teor 
Date:   Fri Jan 5 00:01:15 2018 +1100

Stop refusing fallbacks on the same machine

We only occasionally checked for fallbacks on the same machine.
And I'm not convinced it makes much of a difference with ~150 fallbacks.

Part of #22321.
---
 scripts/maint/fallback.whitelist | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist
index c6e23286d..b8bb82fd0 100644
--- a/scripts/maint/fallback.whitelist
+++ b/scripts/maint/fallback.whitelist
@@ -103,8 +103,8 @@
 171.25.193.77:80 orport=443 id=A10C4F666D27364036B562823E5830BC448E046A 
ipv6=[2001:67c:289c:3::77]:443
 171.25.193.78:80 orport=443 id=A478E421F83194C114F41E94F95999672AED51FE 
ipv6=[2001:67c:289c:3::78]:443
 171.25.193.20:80 orport=443 id=DD8BD7307017407FCC36F8D04A688F74A0774C02 
ipv6=[2001:67c:289c::20]:443
-# OK, but same machine as DD8BD7307017407FCC36F8D04A688F74A0774C02
-#171.25.193.25:80 orport=443 id=185663B7C12777F052B2C2D23D7A239D8DA88A0F 
ipv6=[2001:67c:289c::25]:443
+# same machine as DD8BD7307017407FCC36F8D04A688F74A0774C02
+171.25.193.25:80 orport=443 id=185663B7C12777F052B2C2D23D7A239D8DA88A0F 
ipv6=[2001:67c:289c::25]:443
 
 # Email sent directly to teor, verified using relay contact info
 212.47.229.2:9030 orport=9001 id=20462CBA5DA4C2D963567D17D0B7249718114A68 
ipv6=[2001:bc8:4400:2100::f03]:9001
@@ -623,8 +623,8 @@
 
 # Email sent directly to teor, verified using relay contact info
 192.87.28.28:9030 orport=9001 id=ED2338CAC2711B3E331392E1ED2831219B794024
-# OK, but same machine as ED2338CAC2711B3E331392E1ED2831219B794024
-#192.87.28.82:9030 orport=9001 id=844AE9CAD04325E955E2BE1521563B79FE7094B7
+# same machine as ED2338CAC2711B3E331392E1ED2831219B794024
+192.87.28.82:9030 orport=9001 id=844AE9CAD04325E955E2BE1521563B79FE7094B7
 
 # https://twitter.com/kosjoli/status/719507270904758272
 85.10.202.87:9030 orport=9001 id=971AFB23C168DCD8EDA17473C1C452B359DE3A5A
@@ -793,11 +793,11 @@
 178.33.183.251:80 orport=443 id=DD823AFB415380A802DCAEB9461AE637604107FB 
ipv6=[2001:41d0:2:a683::251]:443
 
 # Email sent directly to teor, verified using relay contact info
-#31.185.104.19:80 orport=443 id=9EAD5B2D3DBD96DBC80DCE423B0C345E920A758D
-# OK, but on same machine as 9EAD5B2D3DBD96DBC80DCE423B0C345E920A758D
+31.185.104.19:80 orport=443 id=9EAD5B2D3DBD96DBC80DCE423B0C345E920A758D
+# same machine as 9EAD5B2D3DBD96DBC80DCE423B0C345E920A758D
 31.185.104.20:80 orport=443 id=ADB2C26629643DBB9F8FE0096E7D16F9414B4F8D
-#31.185.104.21:80 orport=443 id=C2AAB088555850FC434E68943F551072042B85F1
-#31.185.104.22:80 orport=443 id=5BA3A52760A0EABF7E7C3ED3048A77328FF0F148
+31.185.104.21:80 orport=443 id=C2AAB088555850FC434E68943F551072042B85F1
+31.185.104.22:80 orport=443 id=5BA3A52760A0EABF7E7C3ED3048A77328FF0F148
 
 # Email sent directly to teor, verified using relay contact info
 185.34.60.114:80 orport=443 id=7F7A695DF6F2B8640A70B6ADD01105BC2EBC5135



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

[tor-commits] [tor/master] Add a nickname to each fallback in a C comment

2018-01-05 Thread nickm

commit 561f18e724c15c0ad22d2915786fdb8e6ddd9c30
Author: teor 
Date:   Sat Dec 23 00:23:12 2017 +1100

Add a nickname to each fallback in a C comment

This makes it easier for operators to find their relays, and allows stem to
use nicknames to identify fallbacks.

Implements ticket 24600.
---
 changes/ticket24600 | 5 +
 scripts/maint/updateFallbackDirs.py | 7 +++
 2 files changed, 12 insertions(+)

diff --git a/changes/ticket24600 b/changes/ticket24600
new file mode 100644
index 0..c464d0b16
--- /dev/null
+++ b/changes/ticket24600
@@ -0,0 +1,5 @@
+  o Minor features (fallback directory mirrors):
+- Add a nickname to each fallback in a C comment. This makes it easier for
+  operators to find their relays, and allows stem to use nicknames to
+  identify fallbacks.
+  Implements ticket 24600.
diff --git a/scripts/maint/updateFallbackDirs.py 
b/scripts/maint/updateFallbackDirs.py
index 7bd6fae0e..4e4000dce 100755
--- a/scripts/maint/updateFallbackDirs.py
+++ b/scripts/maint/updateFallbackDirs.py
@@ -1331,6 +1331,7 @@ class Candidate(object):
   def fallbackdir_info(self, dl_speed_ok):
 # "address:dirport orport=port id=fingerprint"
 # "[ipv6=addr:orport]"
+# /* nickname=name */
 # ,
 #
 # Do we want a C string, or a commented-out string?
@@ -1355,6 +1356,12 @@ class Candidate(object):
 if self.has_ipv6():
   s += '" ipv6=%s:%d"'%(cleanse_c_string(self.ipv6addr), self.ipv6orport)
   s += '\n'
+if not comment_string:
+  s += '/* '
+s += 'nickname=%s'%(cleanse_c_string(self._data['nickname']))
+if not comment_string:
+  s += ' */'
+s += '\n'
 s += ','
 if comment_string:
   s += '\n'



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

[tor-commits] [tor/master] Remove commas and equals signs from external string inputs to the fallback list

2018-01-05 Thread nickm

commit beedf5fd81c25e67655432e009b047252cd0a970
Author: teor 
Date:   Sun Dec 24 11:24:29 2017 +1100

Remove commas and equals signs from external string inputs to the fallback 
list

This makes sure that list parsers only see one comma per fallback entry,
and only see one equals sign per field.

Implements ticket 24726.
---
 changes/ticket24726 | 4 
 scripts/maint/updateFallbackDirs.py | 8 
 2 files changed, 12 insertions(+)

diff --git a/changes/ticket24726 b/changes/ticket24726
new file mode 100644
index 0..2bbdfa91a
--- /dev/null
+++ b/changes/ticket24726
@@ -0,0 +1,4 @@
+  o Minor features (fallback directory mirrors):
+- Remove commas and equals signs from external string inputs to the
+  fallback list. This avoids format confusion attacks.
+  Implements ticket 24726.
diff --git a/scripts/maint/updateFallbackDirs.py 
b/scripts/maint/updateFallbackDirs.py
index d1f50c70c..52ae886bd 100755
--- a/scripts/maint/updateFallbackDirs.py
+++ b/scripts/maint/updateFallbackDirs.py
@@ -284,6 +284,10 @@ def cleanse_c_multiline_comment(raw_string):
   bad_char_list = '*/'
   # Prevent a malicious string from using C nulls
   bad_char_list += '\0'
+  # Avoid confusing parsers by making sure there is only one comma per fallback
+  bad_char_list += ','
+  # Avoid confusing parsers by making sure there is only one equals per field
+  bad_char_list += '='
   # Be safer by removing bad characters entirely
   cleansed_string = remove_bad_chars(cleansed_string, bad_char_list)
   # Some compilers may further process the content of comments
@@ -304,6 +308,10 @@ def cleanse_c_string(raw_string):
   bad_char_list += '\\'
   # Prevent a malicious string from using C nulls
   bad_char_list += '\0'
+  # Avoid confusing parsers by making sure there is only one comma per fallback
+  bad_char_list += ','
+  # Avoid confusing parsers by making sure there is only one equals per field
+  bad_char_list += '='
   # Be safer by removing bad characters entirely
   cleansed_string = remove_bad_chars(cleansed_string, bad_char_list)
   # Some compilers may further process the content of strings



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

[tor-commits] [tor/master] Update comment and add changes file for 20942

2018-01-05 Thread nickm

commit 9a0cf2376de2ea32cf9059c6760b3d6a0c19e6fa
Author: teor 
Date:   Fri Dec 22 21:49:28 2017 +1100

Update comment and add changes file for 20942
---
 changes/bug20942| 3 +++
 scripts/maint/updateFallbackDirs.py | 9 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/changes/bug20942 b/changes/bug20942
new file mode 100644
index 0..f806ddced
--- /dev/null
+++ b/changes/bug20942
@@ -0,0 +1,3 @@
+  o Minor features (fallback directory mirrors):
+- Reject any fallback directory mirror that serves an expired consensus.
+  Implements ticket 20942, patch by "minik".
diff --git a/scripts/maint/updateFallbackDirs.py 
b/scripts/maint/updateFallbackDirs.py
index 8ca5a7296..cf96fc308 100755
--- a/scripts/maint/updateFallbackDirs.py
+++ b/scripts/maint/updateFallbackDirs.py
@@ -98,10 +98,11 @@ DOWNLOAD_MICRODESC_CONSENSUS = True
 # reject consensuses that are older than REASONABLY_LIVE_TIME.
 # For the consensus expiry check to be accurate, the machine running this
 # script needs an accurate clock.
-# We use 24 hours to compensate for #20909, where relays on 0.2.9.5-alpha and
-# 0.3.0.0-alpha-dev and later deliver stale consensuses, but typically recover
-# after ~12 hours.
-# We should make this lower when #20909 is fixed, see #20942.
+#
+# Relays on 0.3.0 and later return a 404 when they are about to serve an
+# expired consensus. This makes them fail the download check.
+# We use a tolerance of 0, so that 0.2.x series relays also fail the download
+# check if they serve an expired consensus.
 CONSENSUS_EXPIRY_TOLERANCE = 0 
 
 # Output fallback name, flags, bandwidth, and ContactInfo in a C comment?



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

[tor-commits] [tor/master] Update fallback directory mirror details based on opt-ins and opt-outs

2018-01-05 Thread nickm

commit f2a9019569ac197eab2240546ef835bfe3cafb78
Author: teor 
Date:   Fri Dec 22 13:44:07 2017 +1100

Update fallback directory mirror details based on opt-ins and opt-outs

https://lists.torproject.org/pipermail/tor-relays/2017-December/013898.html

Part of 22321.
---
 scripts/maint/fallback.blacklist |   5 +-
 scripts/maint/fallback.whitelist | 242 ---
 2 files changed, 203 insertions(+), 44 deletions(-)

diff --git a/scripts/maint/fallback.blacklist b/scripts/maint/fallback.blacklist
index 84aa7abe8..fb368376f 100644
--- a/scripts/maint/fallback.blacklist
+++ b/scripts/maint/fallback.blacklist
@@ -266,6 +266,9 @@ id=9C8A123081EFBE022EF795630F447839DDFDDDEC
 # Email sent directly to teor, verified using relay contact info
 5.35.251.247:9030 orport=9001 id=9B1F5187DFBA89DC24B37EA7BF896C12B43A27AE
 
-#âhttps://lists.torproject.org/pipermail/tor-relays/2017-May/012281.html
+#https://lists.torproject.org/pipermail/tor-relays/2017-May/012281.html
 62.210.124.124:9030 orport=9001 id=86E78DD3720C78DA8673182EF96C54B162CD660C 
ipv6=[2001:bc8:3f23:100::1]:9001
 62.210.124.124:9130 orport=9101 id=2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E 
ipv6=[2001:bc8:3f23:100::1]:9101
+
+# Email sent directly to teor
+212.51.156.193:995 orport=110 id=32E7AAF1F602814D699BEF6761AD03E387758D49 
ipv6=[2a02:168:4a01::49]:110
diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist
index 6c1504780..7df2dc2d8 100644
--- a/scripts/maint/fallback.whitelist
+++ b/scripts/maint/fallback.whitelist
@@ -30,7 +30,7 @@
 # https://lists.torproject.org/pipermail/tor-relays/2015-December/008362.html
 # https://trac.torproject.org/projects/tor/ticket/22321#comment:22
 78.47.18.110:443 orport=80 id=F8D27B163B9247B232A2EEE68DD8B698695C28DE 
ipv6=[2a01:4f8:120:4023::110]:80 # fluxe3
-131.188.40.188:443 orport=80 id=EBE718E1A49EE229071702964F8DB1F318075FF8 
ipv6=[2001:638:a000:4140:::188]:80
+131.188.40.188:1443 orport=80 id=EBE718E1A49EE229071702964F8DB1F318075FF8 
ipv6=[2001:638:a000:4140:::188]:80 # fluxe4
 
 # https://lists.torproject.org/pipermail/tor-relays/2015-December/008366.html
 5.39.88.19:9030 orport=9001 id=7CB8C31432A796731EA7B6BF4025548DFEB25E0C 
ipv6=[2001:41d0:8:9a13::1]:9050
@@ -57,12 +57,17 @@
 91.121.84.137:4952 orport=4052 id=9FBEB75E8BC142565F12CBBE078D63310236A334
 
 # https://lists.torproject.org/pipermail/tor-relays/2015-December/008381.html
-# Sent additional email to teor with more relays
-178.254.44.135:9030 orport=9001 id=8FA37B93397015B2BC5A525C908485260BE9F422
-178.254.20.134:80 orport=443 id=9F5068310818ED7C70B0BC4087AB55CB12CB4377
-178.254.20.134:9030 orport=9001 id=2CE96A8A1DA032664C90F574AFFBECE18A6E8DFC
-178.254.44.135:80 orport=443 id=AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2
-178.254.13.126:9030 orport=9001 id=0C475BA4D3AA3C289B716F95954CAD616E50C4E5
+# Sent additional emails to teor with updated relays
+81.7.11.96:9030 orport=9001 id=8FA37B93397015B2BC5A525C908485260BE9F422 # 
Doedel22
+# 9F5068310818ED7C70B0BC4087AB55CB12CB4377 not found in current consensus
+178.254.19.101:80 orport=443 id=F9246DEF2B653807236DA134F2AEAB103D58ABFE # 
Freebird31
+178.254.19.101:9030 orport=9001 id=0C475BA4D3AA3C289B716F95954CAD616E50C4E5 # 
Freebird32
+81.7.14.253:9001 orport=443 id=1AE039EE0B11DB79E4B4B29CBA9F752864A0259E # 
Ichotolot60
+81.7.11.186:1080 orport=443 id=B86137AE9681701901C6720E55C16805B46BD8E3 # 
BeastieJoy60
+85.25.213.211:465 orport=80 id=CE47F0356D86CF0A1A2008D97623216D560FB0A8 # 
BeastieJoy61
+85.25.159.65:995 orport=80 id=52BFADA8BEAA01BA46C8F767F83C18E2FE50C1B9 # 
BeastieJoy63
+81.7.3.67:993 orport=443 id=A2E6BB5C391CD46B38C55B4329C35304540771F1 # 
BeastieJoy62
+81.7.14.31:9001 orport=443 id=7600680249A22080ECC6173FBBF64D6FCF330A61 # 
Ichotolot62
 
 # https://lists.torproject.org/pipermail/tor-relays/2015-December/008382.html
 51.255.33.237:9091 orport=9001 id=A360C21FA87FFA2046D92C17086A6B47E5C68109
@@ -292,14 +297,15 @@
 46.148.18.74:8080 orport=443 id=6CACF0B5F03C779672F3C5C295F37C8D234CA3F7
 
 # Email sent directly to teor, verified using relay contact info
-37.187.102.108:9090 orport=5550 id=F4263275CF54A6836EE7BD527B1328836A6F06E1
-212.47.241.21:80 orport=443 id=892F941915F6A0C6E0958E52E0A9685C190CF45C
+37.187.102.108:80 orport=443 id=F4263275CF54A6836EE7BD527B1328836A6F06E1 
ipv6=[2001:41d0:a:266c::1]:443 # EvilMoe
+212.47.241.21:80 orport=443 id=892F941915F6A0C6E0958E52E0A9685C190CF45C # 
EvilMoe
 
 # Email sent directly to teor, verified using relay contact info
 212.129.38.254:9030 orport=9001 id=FDF845FC159C0020E2BDDA120C30C5C5038F74B4
 
-# Email sent directly to teor, verified using relay contact info
-37.157.195.87:8030 orport=443 id=12FD624EE73CEF37137C90D38B2406A66F68FAA2
+# Email sent directly to teor
+37.157.195.87:8030 orport=443 id=12FD624EE73CEF37137C90D38B2406A66F68FAA2 # 
thanatosCZ
+5.189.169.190:8030 orport=8080 id=8D79F73DCD91FC4F5017422FAC70074D6DB8DD81 # 
thanatosDE
 
 #

[tor-commits] [tor/master] Remove the "weight=10" line from fallback directory mirror entries

2018-01-05 Thread nickm

commit ac5058ac8a6eeb3ebb0790d33dbeee4473dcaae7
Author: teor 
Date:   Fri Dec 22 23:05:45 2017 +1100

Remove the "weight=10" line from fallback directory mirror entries

This removes some redundant repeated lines.

Ticket 24681 will maintain the current fallback weights by changing
Tor's default fallback weight to 10.

Implements ticket 24679.
---
 changes/ticket24679 |  5 +
 scripts/maint/updateFallbackDirs.py | 19 ++-
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/changes/ticket24679 b/changes/ticket24679
new file mode 100644
index 0..183e60ae9
--- /dev/null
+++ b/changes/ticket24679
@@ -0,0 +1,5 @@
+  o Minor features (fallback directory mirrors):
+- Remove the "weight=10" line from fallback directory mirror entries.
+  Ticket 24681 will maintain the current fallback weights by changing
+  Tor's default fallback weight to 10.
+  Implements ticket 24679.
diff --git a/scripts/maint/updateFallbackDirs.py 
b/scripts/maint/updateFallbackDirs.py
index 7869d942c..7bd6fae0e 100755
--- a/scripts/maint/updateFallbackDirs.py
+++ b/scripts/maint/updateFallbackDirs.py
@@ -245,21 +245,6 @@ CONSENSUS_DOWNLOAD_SPEED_MAX = 15.0
 # This avoids delisting a relay due to transient network conditions
 CONSENSUS_DOWNLOAD_RETRY = True
 
-## Fallback Weights for Client Selection
-
-# All fallback weights are equal, and set to the value below
-# Authorities are weighted 1.0 by default
-# Clients use these weights to select fallbacks and authorities at random
-# If there are 100 fallbacks and 9 authorities:
-#  - each fallback is chosen with probability 10.0/(10.0*100 + 1.0*9) ~= 0.99%
-#  - each authority is chosen with probability 1.0/(10.0*100 + 1.0*9) ~= 0.09%
-# A client choosing a bootstrap directory server will choose a fallback for
-# 10.0/(10.0*100 + 1.0*9) * 100 = 99.1% of attempts, and an authority for
-# 1.0/(10.0*100 + 1.0*9) * 9 = 0.9% of attempts.
-# (This disregards the bootstrap schedules, where clients start by choosing
-# from fallbacks & authoritites, then later choose from only authorities.)
-FALLBACK_OUTPUT_WEIGHT = 10.0
-
 ## Parsing Functions
 
 def parse_ts(t):
@@ -1346,7 +1331,7 @@ class Candidate(object):
   def fallbackdir_info(self, dl_speed_ok):
 # "address:dirport orport=port id=fingerprint"
 # "[ipv6=addr:orport]"
-# "weight=FALLBACK_OUTPUT_WEIGHT",
+# ,
 #
 # Do we want a C string, or a commented-out string?
 c_string = dl_speed_ok
@@ -1370,7 +1355,7 @@ class Candidate(object):
 if self.has_ipv6():
   s += '" ipv6=%s:%d"'%(cleanse_c_string(self.ipv6addr), self.ipv6orport)
   s += '\n'
-s += '" weight=%d",'%(FALLBACK_OUTPUT_WEIGHT)
+s += ','
 if comment_string:
   s += '\n'
   s += '*/'



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

[tor-commits] [tor/master] Add an extrainfo cache flag for each fallback in a C comment

2018-01-05 Thread nickm

commit 6a27fc62456891f2eec9e2149a3c0eb9b66f6ee9
Author: teor 
Date:   Sat Dec 23 01:21:49 2017 +1100

Add an extrainfo cache flag for each fallback in a C comment

This allows stem to use fallbacks to fetch extra-info documents,
rather than using authorities.

Implements ticket 22759.
---
 changes/ticket22759 |  5 +++
 scripts/maint/updateFallbackDirs.py | 75 -
 2 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/changes/ticket22759 b/changes/ticket22759
new file mode 100644
index 0..a393d428a
--- /dev/null
+++ b/changes/ticket22759
@@ -0,0 +1,5 @@
+  o Minor features (fallback directory mirrors):
+- Add an extrainfo cache flag for each fallback in a C comment.
+  This allows stem to use fallbacks to fetch extra-info documents,
+  rather than using authorities.
+  Implements ticket 22759.
diff --git a/scripts/maint/updateFallbackDirs.py 
b/scripts/maint/updateFallbackDirs.py
index 4e4000dce..d1f50c70c 100755
--- a/scripts/maint/updateFallbackDirs.py
+++ b/scripts/maint/updateFallbackDirs.py
@@ -47,7 +47,7 @@ import copy
 import re
 
 from stem.descriptor import DocumentHandler
-from stem.descriptor.remote import get_consensus
+from stem.descriptor.remote import get_consensus, get_server_descriptors, 
MAX_FINGERPRINTS
 
 import logging
 logging.root.name = ''
@@ -565,6 +565,7 @@ class Candidate(object):
 if not self.has_ipv6():
   logging.debug("Failed to get an ipv6 address for %s."%(self._fpr,))
 self._compute_version()
+self._extra_info_cache = None
 
   def _stable_sort_or_addresses(self):
 # replace self._data['or_addresses'] with a stable ordering,
@@ -1332,6 +1333,7 @@ class Candidate(object):
 # "address:dirport orport=port id=fingerprint"
 # "[ipv6=addr:orport]"
 # /* nickname=name */
+# /* extrainfo={0,1} */
 # ,
 #
 # Do we want a C string, or a commented-out string?
@@ -1362,6 +1364,14 @@ class Candidate(object):
 if not comment_string:
   s += ' */'
 s += '\n'
+# if we know that the fallback is an extrainfo cache, flag it
+# and if we don't know, assume it is not
+if not comment_string:
+  s += '/* '
+s += 'extrainfo=%d'%(1 if self._extra_info_cache else 0)
+if not comment_string:
+  s += ' */'
+s += '\n'
 s += ','
 if comment_string:
   s += '\n'
@@ -1747,6 +1757,53 @@ class CandidateList(dict):
 self.fallbacks = family_limit_fallbacks
 return original_count - len(self.fallbacks)
 
+  # try once to get the descriptors for fingerprint_list using stem
+  # returns an empty list on exception
+  @staticmethod
+  def get_fallback_descriptors_once(fingerprint_list):
+desc_list = 
get_server_descriptors(fingerprints=fingerprint_list).run(suppress=True)
+return desc_list
+
+  # try up to max_retries times to get the descriptors for fingerprint_list
+  # using stem. Stops retrying when all descriptors have been retrieved.
+  # returns a list containing the descriptors that were retrieved
+  @staticmethod
+  def get_fallback_descriptors(fingerprint_list, max_retries=5):
+# we can't use stem's retries=, because we want to support more than 96
+# descriptors
+#
+# add an attempt for every MAX_FINGERPRINTS (or part thereof) in the list
+max_retries += (len(fingerprint_list) + MAX_FINGERPRINTS - 1) / 
MAX_FINGERPRINTS
+remaining_list = fingerprint_list
+desc_list = []
+for _ in xrange(max_retries):
+  if len(remaining_list) == 0:
+break
+  new_desc_list = 
CandidateList.get_fallback_descriptors_once(remaining_list[0:MAX_FINGERPRINTS])
+  for d in new_desc_list:
+try:
+  remaining_list.remove(d.fingerprint)
+except ValueError:
+  # warn and ignore if a directory mirror returned a bad descriptor
+  logging.warning("Directory mirror returned unwanted descriptor %s, 
ignoring",
+  d.fingerprint)
+  continue
+desc_list.append(d)
+return desc_list
+
+  # find the fallbacks that cache extra-info documents
+  # Onionoo doesn't know this, so we have to use stem
+  def mark_extra_info_caches(self):
+fingerprint_list = [ f._fpr for f in self.fallbacks ]
+logging.info("Downloading fallback descriptors to find extra-info caches")
+desc_list = CandidateList.get_fallback_descriptors(fingerprint_list)
+for d in desc_list:
+  self[d.fingerprint]._extra_info_cache = d.extra_info_cache
+missing_descriptor_list = [ f._fpr for f in self.fallbacks
+if f._extra_info_cache is None ]
+for f in missing_descriptor_list:
+  logging.warning("No descriptor for {}. Assuming extrainfo=0.".format(f))
+
   # try a download check on each fallback candidate in order
   # stop after max_count successful downloads
   # but don't remove any candidates from the array
@@ -1994,6 +2051,18 @@ class

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

2018-01-05 Thread nickm

commit 48d94e290dec5a5563d8ba97754b98f4374e9566
Merge: c1d98c75e 16fd975a8
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 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] Update the version header in the current fallback file to 2.0.0

2018-01-05 Thread nickm

commit 20b96cee6413322d665229c328aaaedff960e27b
Author: teor 
Date:   Sun Dec 24 11:41:41 2017 +1100

Update the version header in the current fallback file to 2.0.0

The upcoming fallback rebuild will automatically generate this new format.

Follow-up to 24725, due to breaking changes in 24679, 24600, and 22759.
---
 src/or/fallback_dirs.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc
index b7a2a099f..170f1a01a 100644
--- a/src/or/fallback_dirs.inc
+++ b/src/or/fallback_dirs.inc
@@ -1,5 +1,5 @@
 /* type=fallback */
-/* version=1.0.0 */
+/* version=2.0.0 */
 /* Whitelist & blacklist excluded 1326 of 1513 candidates. */
 /* To comment-out entries in this file, use C comments, and add * to the start 
of each line. (stem finds fallback entries using " at the start of a line.) */
 /* Checked IPv4 DirPorts served a consensus within 15.0s. */



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

[tor-commits] [tor/master] Add a delimiter to the end of each fallback entry

2018-01-05 Thread nickm

commit b6033f573408e8af4d5d26a63f14401b1614d226
Author: teor 
Date:   Sun Dec 24 12:50:42 2017 +1100

Add a delimiter to the end of each fallback entry

This helps external parsers.

Also, add comments indicating where to add new fields in the fallback
format.

Part of 24725.
---
 changes/ticket24725 |  1 +
 scripts/maint/updateFallbackDirs.py | 22 ++
 2 files changed, 23 insertions(+)

diff --git a/changes/ticket24725 b/changes/ticket24725
index 2fe1848ab..9db7ef8b1 100644
--- a/changes/ticket24725
+++ b/changes/ticket24725
@@ -1,4 +1,5 @@
   o Minor features (fallback directory mirrors):
 - Add a type and version header to the fallback directory mirror file.
+  Also add a delimiter to the end of each fallback entry.
   This helps external parsers like stem and Relay Search.
   Implements ticket 24725.
diff --git a/scripts/maint/updateFallbackDirs.py 
b/scripts/maint/updateFallbackDirs.py
index 52ae886bd..30c63a5b8 100755
--- a/scripts/maint/updateFallbackDirs.py
+++ b/scripts/maint/updateFallbackDirs.py
@@ -76,6 +76,8 @@ except ImportError:
 # * patch changes include changing header comments or other unstructured
 #   content
 FALLBACK_FORMAT_VERSION = '2.0.0'
+SECTION_SEPARATOR_BASE = '='
+SECTION_SEPARATOR_COMMENT = '/* ' + SECTION_SEPARATOR_BASE + ' */'
 
 # Output all candidate fallbacks, or only output selected fallbacks?
 OUTPUT_CANDIDATES = False
@@ -1339,9 +1341,13 @@ class Candidate(object):
   # comment-out the returned string
   def fallbackdir_info(self, dl_speed_ok):
 # "address:dirport orport=port id=fingerprint"
+# (insert additional madatory fields here)
 # "[ipv6=addr:orport]"
+# (insert additional optional fields here)
 # /* nickname=name */
 # /* extrainfo={0,1} */
+# (insert additional comment fields here)
+# /* = */
 # ,
 #
 # Do we want a C string, or a commented-out string?
@@ -1363,9 +1369,11 @@ class Candidate(object):
 self.orport,
 cleanse_c_string(self._fpr))
 s += '\n'
+# (insert additional madatory fields here)
 if self.has_ipv6():
   s += '" ipv6=%s:%d"'%(cleanse_c_string(self.ipv6addr), self.ipv6orport)
   s += '\n'
+# (insert additional optional fields here)
 if not comment_string:
   s += '/* '
 s += 'nickname=%s'%(cleanse_c_string(self._data['nickname']))
@@ -1380,6 +1388,14 @@ class Candidate(object):
 if not comment_string:
   s += ' */'
 s += '\n'
+# (insert additional comment fields here)
+# The terminator and comma must be the last line in each fallback entry
+if not comment_string:
+  s += '/* '
+s += SECTION_SEPARATOR_BASE
+if not comment_string:
+  s += ' */'
+s += '\n'
 s += ','
 if comment_string:
   s += '\n'
@@ -2205,6 +2221,9 @@ def list_fallbacks(whitelist, blacklist):
   print "/* type=fallback */"
   print ("/* version={} */"
  .format(cleanse_c_multiline_comment(FALLBACK_FORMAT_VERSION)))
+  # end the header with a separator, to make it easier for parsers
+  print SECTION_SEPARATOR_COMMENT
+
   logging.warning('Downloading and parsing Onionoo data. ' +
   'This may take some time.')
   # find relays that could be fallbacks
@@ -2296,6 +2315,9 @@ def list_fallbacks(whitelist, blacklist):
   for s in fetch_source_list():
 print describe_fetch_source(s)
 
+  # start the list with a separator, to make it easy for parsers
+  print SECTION_SEPARATOR_COMMENT
+
   # sort the list differently depending on why we've created it:
   # if we're outputting the final fallback list, sort by fingerprint
   # this makes diffs much more stable



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

[tor-commits] [tor/master] Add a version 1.0.0 header to the current fallback file

2018-01-05 Thread nickm

commit 0e6fdbea8d788130d22a6c43772f60df2f05bc00
Author: teor 
Date:   Sun Dec 24 11:38:41 2017 +1100

Add a version 1.0.0 header to the current fallback file

The upcoming fallback rebuild will automatically generate this new format,
with version 2.0.0.

Follow-up to 24725.
---
 src/or/fallback_dirs.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc
index cc37e5f9a..72f8d520c 100644
--- a/src/or/fallback_dirs.inc
+++ b/src/or/fallback_dirs.inc
@@ -1,3 +1,5 @@
+/* type=fallback */
+/* version=1.0.0 */
 /* Whitelist & blacklist excluded 1326 of 1513 candidates. */
 /* To comment-out entries in this file, use C comments, and add * to the start 
of each line. (stem finds fallback entries using " at the start of a line.) */
 /* Checked IPv4 DirPorts served a consensus within 15.0s. */



___
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] fix a wide line

2018-01-05 Thread nickm

commit 94d5523c7f100a2fc94869c55af6ec8e3429df2a
Author: Nick Mathewson 
Date:   Fri Jan 5 11:28:23 2018 -0500

fix a wide line
---
 src/or/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 2a0d091a2..dd0016f7a 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -230,8 +230,8 @@ static config_var_t option_vars_[] = {
* fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
*
* We want to reduce load on authorities, but keep these two figures within
-   * an order of magnitude, so there isn't too much load shifting to 
authorities
-   * when fallbacks go down. */
+   * an order of magnitude, so there isn't too much load shifting to
+   * authorities when fallbacks go down. */
   V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
   V(DisableAllSwap,  BOOL, "0"),
   V(DisableDebuggerAttachment,   BOOL, "1"),



___
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-05 Thread nickm

commit e9a102ff5e5a9bd4864baad95352168002be414d
Merge: ed304a052 48d94e290
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 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/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-05 Thread nickm

commit 8edc0be74baf61d5bd3db92106c83241289525c0
Merge: c7c043d2b 3618bd616
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:35 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 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/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0

2018-01-05 Thread nickm

commit 16fd975a82e502418578c81f04894272c4f11826
Merge: bbc9ff160 c52d4d9e3
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 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/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-01-05 Thread nickm

commit 3618bd6166002c7aadbb832d8a3e8bdba193f00c
Merge: 9ef97a268 48d94e290
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --cc doc/tor.1.txt
index fc285ebe1,c4c569836..a319aa938
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@@ -466,11 -450,12 +466,12 @@@ GENERAL OPTION
  When configured to use both directory authorities and fallback
  directories, the directory authorities also work as fallbacks. They are
  chosen with their regular weights, multiplied by this number, which
- should be 1.0 or less. (Default: 1.0)
+ should be 1.0 or less. The default is less than 1, to reduce load on
+ authorities. (Default: 0.1)
  
 -[[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] 
[**flags**] __address__:__port__ __fingerprint__ +
 +[[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] 
[**flags**] __ipv4address__:__port__ __fingerprint__ +
  
 -[[AlternateBridgeAuthority]] **AlternateBridgeAuthority** [__nickname__] 
[**flags**] __address__:__port__ __ fingerprint__::
 +[[AlternateBridgeAuthority]] **AlternateBridgeAuthority** [__nickname__] 
[**flags**] __ipv4address__:__port__ __ fingerprint__::
  These options behave as DirAuthority, but they replace fewer of the
  default directory authorities. Using
  AlternateDirAuthority replaces the default Tor directory authorities, but



___
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] Make the default DirAuthorityFallbackRate 0.1

2018-01-05 Thread nickm

commit 30e13716754bc3d991500f5f68eb83a19aea9b11
Author: teor 
Date:   Sat Dec 23 00:00:18 2017 +1100

Make the default DirAuthorityFallbackRate 0.1

This makes clients on the public tor network prefer to bootstrap off 
fallback
directory mirrors.

This is a follow-up to 24679, which removed weights from the default 
fallbacks.

Implements ticket 24681.
---
 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/changes/ticket24681 b/changes/ticket24681
new file mode 100644
index 0..cc0a42b2e
--- /dev/null
+++ b/changes/ticket24681
@@ -0,0 +1,6 @@
+  o Minor features (fallback directory mirrors):
+- Make the default DirAuthorityFallbackRate 0.1, so that clients on the
+  public tor network prefer to bootstrap off fallback directory mirrors.
+  This is a follow-up to 24679, which removed weights from the default
+  fallbacks.
+  Implements ticket 24681.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 74915b711..b286a0656 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -432,7 +432,8 @@ GENERAL OPTIONS
 When configured to use both directory authorities and fallback
 directories, the directory authorities also work as fallbacks. They are
 chosen with their regular weights, multiplied by this number, which
-should be 1.0 or less. (Default: 1.0)
+should be 1.0 or less. The default is less than 1, to reduce load on
+authorities. (Default: 0.1)
 
 [[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] [**flags**] 
__address__:__port__ __fingerprint__ +
 
diff --git a/src/or/config.c b/src/or/config.c
index 557790a81..2a0d091a2 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -225,7 +225,14 @@ static config_var_t option_vars_[] = {
   VAR("DirReqStatistics",BOOL, DirReqStatistics_option, "1"),
   VAR("DirAuthority",LINELIST, DirAuthorities, NULL),
   V(DirCache,BOOL, "1"),
-  V(DirAuthorityFallbackRate,DOUBLE,   "1.0"),
+  /* A DirAuthorityFallbackRate of 0.1 means that 0.5% of clients try an
+   * authority when all fallbacks are up, and 2% try an authority when 25% of
+   * fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
+   *
+   * We want to reduce load on authorities, but keep these two figures within
+   * an order of magnitude, so there isn't too much load shifting to 
authorities
+   * when fallbacks go down. */
+  V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
   V(DisableAllSwap,  BOOL, "0"),
   V(DisableDebuggerAttachment,   BOOL, "1"),
   V(DisableIOCP, BOOL, "1"),



___
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-05 Thread nickm

commit 74842cce63fee55389179c2dd45346f0c257a6ff
Merge: 45a93ac80 c52d4d9e3
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 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/release-0.3.0] fix a wide line

2018-01-05 Thread nickm

commit 94d5523c7f100a2fc94869c55af6ec8e3429df2a
Author: Nick Mathewson 
Date:   Fri Jan 5 11:28:23 2018 -0500

fix a wide line
---
 src/or/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 2a0d091a2..dd0016f7a 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -230,8 +230,8 @@ static config_var_t option_vars_[] = {
* fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
*
* We want to reduce load on authorities, but keep these two figures within
-   * an order of magnitude, so there isn't too much load shifting to 
authorities
-   * when fallbacks go down. */
+   * an order of magnitude, so there isn't too much load shifting to
+   * authorities when fallbacks go down. */
   V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
   V(DisableAllSwap,  BOOL, "0"),
   V(DisableDebuggerAttachment,   BOOL, "1"),



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

2018-01-05 Thread nickm

commit c52d4d9e3454fd0a94cb900dc18516a489441c18
Merge: c9b3f6352 94d5523c7
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:31 2018 -0500

Merge branch 'teor_ticket24681_028' into maint-0.2.9

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --cc src/or/config.c
index ddf49b037,dd0016f7a..42ff25877
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -226,10 -225,17 +226,17 @@@ static config_var_t option_vars_[] = 
VAR("DirReqStatistics",BOOL, DirReqStatistics_option, "1"),
VAR("DirAuthority",LINELIST, DirAuthorities, NULL),
V(DirCache,BOOL, "1"),
-   V(DirAuthorityFallbackRate,DOUBLE,   "1.0"),
+   /* A DirAuthorityFallbackRate of 0.1 means that 0.5% of clients try an
+* authority when all fallbacks are up, and 2% try an authority when 25% of
+* fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
+*
+* We want to reduce load on authorities, but keep these two figures within
+* an order of magnitude, so there isn't too much load shifting to
+* authorities when fallbacks go down. */
+   V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
V(DisableAllSwap,  BOOL, "0"),
V(DisableDebuggerAttachment,   BOOL, "1"),
 -  V(DisableIOCP, BOOL, "1"),
 +  OBSOLETE("DisableIOCP"),
OBSOLETE("DisableV2DirectoryInfo_"),
OBSOLETE("DynamicDHGroups"),
VPORT(DNSPort, LINELIST, NULL),



___
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-05 Thread nickm

commit 48d94e290dec5a5563d8ba97754b98f4374e9566
Merge: c1d98c75e 16fd975a8
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 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/release-0.3.1] Make the default DirAuthorityFallbackRate 0.1

2018-01-05 Thread nickm

commit 30e13716754bc3d991500f5f68eb83a19aea9b11
Author: teor 
Date:   Sat Dec 23 00:00:18 2017 +1100

Make the default DirAuthorityFallbackRate 0.1

This makes clients on the public tor network prefer to bootstrap off 
fallback
directory mirrors.

This is a follow-up to 24679, which removed weights from the default 
fallbacks.

Implements ticket 24681.
---
 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/changes/ticket24681 b/changes/ticket24681
new file mode 100644
index 0..cc0a42b2e
--- /dev/null
+++ b/changes/ticket24681
@@ -0,0 +1,6 @@
+  o Minor features (fallback directory mirrors):
+- Make the default DirAuthorityFallbackRate 0.1, so that clients on the
+  public tor network prefer to bootstrap off fallback directory mirrors.
+  This is a follow-up to 24679, which removed weights from the default
+  fallbacks.
+  Implements ticket 24681.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 74915b711..b286a0656 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -432,7 +432,8 @@ GENERAL OPTIONS
 When configured to use both directory authorities and fallback
 directories, the directory authorities also work as fallbacks. They are
 chosen with their regular weights, multiplied by this number, which
-should be 1.0 or less. (Default: 1.0)
+should be 1.0 or less. The default is less than 1, to reduce load on
+authorities. (Default: 0.1)
 
 [[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] [**flags**] 
__address__:__port__ __fingerprint__ +
 
diff --git a/src/or/config.c b/src/or/config.c
index 557790a81..2a0d091a2 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -225,7 +225,14 @@ static config_var_t option_vars_[] = {
   VAR("DirReqStatistics",BOOL, DirReqStatistics_option, "1"),
   VAR("DirAuthority",LINELIST, DirAuthorities, NULL),
   V(DirCache,BOOL, "1"),
-  V(DirAuthorityFallbackRate,DOUBLE,   "1.0"),
+  /* A DirAuthorityFallbackRate of 0.1 means that 0.5% of clients try an
+   * authority when all fallbacks are up, and 2% try an authority when 25% of
+   * fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
+   *
+   * We want to reduce load on authorities, but keep these two figures within
+   * an order of magnitude, so there isn't too much load shifting to 
authorities
+   * when fallbacks go down. */
+  V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
   V(DisableAllSwap,  BOOL, "0"),
   V(DisableDebuggerAttachment,   BOOL, "1"),
   V(DisableIOCP, BOOL, "1"),



___
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-05 Thread nickm

commit 16fd975a82e502418578c81f04894272c4f11826
Merge: bbc9ff160 c52d4d9e3
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 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/release-0.3.2] Merge branch 'teor_ticket24681_028' into maint-0.2.9

2018-01-05 Thread nickm

commit c52d4d9e3454fd0a94cb900dc18516a489441c18
Merge: c9b3f6352 94d5523c7
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:31 2018 -0500

Merge branch 'teor_ticket24681_028' into maint-0.2.9

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --cc src/or/config.c
index ddf49b037,dd0016f7a..42ff25877
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -226,10 -225,17 +226,17 @@@ static config_var_t option_vars_[] = 
VAR("DirReqStatistics",BOOL, DirReqStatistics_option, "1"),
VAR("DirAuthority",LINELIST, DirAuthorities, NULL),
V(DirCache,BOOL, "1"),
-   V(DirAuthorityFallbackRate,DOUBLE,   "1.0"),
+   /* A DirAuthorityFallbackRate of 0.1 means that 0.5% of clients try an
+* authority when all fallbacks are up, and 2% try an authority when 25% of
+* fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
+*
+* We want to reduce load on authorities, but keep these two figures within
+* an order of magnitude, so there isn't too much load shifting to
+* authorities when fallbacks go down. */
+   V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
V(DisableAllSwap,  BOOL, "0"),
V(DisableDebuggerAttachment,   BOOL, "1"),
 -  V(DisableIOCP, BOOL, "1"),
 +  OBSOLETE("DisableIOCP"),
OBSOLETE("DisableV2DirectoryInfo_"),
OBSOLETE("DynamicDHGroups"),
VPORT(DNSPort, LINELIST, NULL),



___
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-05 Thread nickm

commit 16fd975a82e502418578c81f04894272c4f11826
Merge: bbc9ff160 c52d4d9e3
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 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 'teor_ticket24681_028' into maint-0.2.9

2018-01-05 Thread nickm

commit c52d4d9e3454fd0a94cb900dc18516a489441c18
Merge: c9b3f6352 94d5523c7
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:31 2018 -0500

Merge branch 'teor_ticket24681_028' into maint-0.2.9

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --cc src/or/config.c
index ddf49b037,dd0016f7a..42ff25877
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -226,10 -225,17 +226,17 @@@ static config_var_t option_vars_[] = 
VAR("DirReqStatistics",BOOL, DirReqStatistics_option, "1"),
VAR("DirAuthority",LINELIST, DirAuthorities, NULL),
V(DirCache,BOOL, "1"),
-   V(DirAuthorityFallbackRate,DOUBLE,   "1.0"),
+   /* A DirAuthorityFallbackRate of 0.1 means that 0.5% of clients try an
+* authority when all fallbacks are up, and 2% try an authority when 25% of
+* fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
+*
+* We want to reduce load on authorities, but keep these two figures within
+* an order of magnitude, so there isn't too much load shifting to
+* authorities when fallbacks go down. */
+   V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
V(DisableAllSwap,  BOOL, "0"),
V(DisableDebuggerAttachment,   BOOL, "1"),
 -  V(DisableIOCP, BOOL, "1"),
 +  OBSOLETE("DisableIOCP"),
OBSOLETE("DisableV2DirectoryInfo_"),
OBSOLETE("DynamicDHGroups"),
VPORT(DNSPort, LINELIST, NULL),



___
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-05 Thread nickm

commit 48d94e290dec5a5563d8ba97754b98f4374e9566
Merge: c1d98c75e 16fd975a8
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 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/release-0.3.1] Merge branch 'teor_ticket24681_028' into maint-0.2.9

2018-01-05 Thread nickm

commit c52d4d9e3454fd0a94cb900dc18516a489441c18
Merge: c9b3f6352 94d5523c7
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:31 2018 -0500

Merge branch 'teor_ticket24681_028' into maint-0.2.9

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --cc src/or/config.c
index ddf49b037,dd0016f7a..42ff25877
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -226,10 -225,17 +226,17 @@@ static config_var_t option_vars_[] = 
VAR("DirReqStatistics",BOOL, DirReqStatistics_option, "1"),
VAR("DirAuthority",LINELIST, DirAuthorities, NULL),
V(DirCache,BOOL, "1"),
-   V(DirAuthorityFallbackRate,DOUBLE,   "1.0"),
+   /* A DirAuthorityFallbackRate of 0.1 means that 0.5% of clients try an
+* authority when all fallbacks are up, and 2% try an authority when 25% of
+* fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
+*
+* We want to reduce load on authorities, but keep these two figures within
+* an order of magnitude, so there isn't too much load shifting to
+* authorities when fallbacks go down. */
+   V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
V(DisableAllSwap,  BOOL, "0"),
V(DisableDebuggerAttachment,   BOOL, "1"),
 -  V(DisableIOCP, BOOL, "1"),
 +  OBSOLETE("DisableIOCP"),
OBSOLETE("DisableV2DirectoryInfo_"),
OBSOLETE("DynamicDHGroups"),
VPORT(DNSPort, LINELIST, NULL),



___
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] Make the default DirAuthorityFallbackRate 0.1

2018-01-05 Thread nickm

commit 30e13716754bc3d991500f5f68eb83a19aea9b11
Author: teor 
Date:   Sat Dec 23 00:00:18 2017 +1100

Make the default DirAuthorityFallbackRate 0.1

This makes clients on the public tor network prefer to bootstrap off 
fallback
directory mirrors.

This is a follow-up to 24679, which removed weights from the default 
fallbacks.

Implements ticket 24681.
---
 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/changes/ticket24681 b/changes/ticket24681
new file mode 100644
index 0..cc0a42b2e
--- /dev/null
+++ b/changes/ticket24681
@@ -0,0 +1,6 @@
+  o Minor features (fallback directory mirrors):
+- Make the default DirAuthorityFallbackRate 0.1, so that clients on the
+  public tor network prefer to bootstrap off fallback directory mirrors.
+  This is a follow-up to 24679, which removed weights from the default
+  fallbacks.
+  Implements ticket 24681.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 74915b711..b286a0656 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -432,7 +432,8 @@ GENERAL OPTIONS
 When configured to use both directory authorities and fallback
 directories, the directory authorities also work as fallbacks. They are
 chosen with their regular weights, multiplied by this number, which
-should be 1.0 or less. (Default: 1.0)
+should be 1.0 or less. The default is less than 1, to reduce load on
+authorities. (Default: 0.1)
 
 [[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] [**flags**] 
__address__:__port__ __fingerprint__ +
 
diff --git a/src/or/config.c b/src/or/config.c
index 557790a81..2a0d091a2 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -225,7 +225,14 @@ static config_var_t option_vars_[] = {
   VAR("DirReqStatistics",BOOL, DirReqStatistics_option, "1"),
   VAR("DirAuthority",LINELIST, DirAuthorities, NULL),
   V(DirCache,BOOL, "1"),
-  V(DirAuthorityFallbackRate,DOUBLE,   "1.0"),
+  /* A DirAuthorityFallbackRate of 0.1 means that 0.5% of clients try an
+   * authority when all fallbacks are up, and 2% try an authority when 25% of
+   * fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
+   *
+   * We want to reduce load on authorities, but keep these two figures within
+   * an order of magnitude, so there isn't too much load shifting to 
authorities
+   * when fallbacks go down. */
+  V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
   V(DisableAllSwap,  BOOL, "0"),
   V(DisableDebuggerAttachment,   BOOL, "1"),
   V(DisableIOCP, BOOL, "1"),



___
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-05 Thread nickm

commit 16fd975a82e502418578c81f04894272c4f11826
Merge: bbc9ff160 c52d4d9e3
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 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/release-0.3.1] fix a wide line

2018-01-05 Thread nickm

commit 94d5523c7f100a2fc94869c55af6ec8e3429df2a
Author: Nick Mathewson 
Date:   Fri Jan 5 11:28:23 2018 -0500

fix a wide line
---
 src/or/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 2a0d091a2..dd0016f7a 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -230,8 +230,8 @@ static config_var_t option_vars_[] = {
* fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
*
* We want to reduce load on authorities, but keep these two figures within
-   * an order of magnitude, so there isn't too much load shifting to 
authorities
-   * when fallbacks go down. */
+   * an order of magnitude, so there isn't too much load shifting to
+   * authorities when fallbacks go down. */
   V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
   V(DisableAllSwap,  BOOL, "0"),
   V(DisableDebuggerAttachment,   BOOL, "1"),



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

[tor-commits] [tor/master] Make the default DirAuthorityFallbackRate 0.1

2018-01-05 Thread nickm

commit 30e13716754bc3d991500f5f68eb83a19aea9b11
Author: teor 
Date:   Sat Dec 23 00:00:18 2017 +1100

Make the default DirAuthorityFallbackRate 0.1

This makes clients on the public tor network prefer to bootstrap off 
fallback
directory mirrors.

This is a follow-up to 24679, which removed weights from the default 
fallbacks.

Implements ticket 24681.
---
 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/changes/ticket24681 b/changes/ticket24681
new file mode 100644
index 0..cc0a42b2e
--- /dev/null
+++ b/changes/ticket24681
@@ -0,0 +1,6 @@
+  o Minor features (fallback directory mirrors):
+- Make the default DirAuthorityFallbackRate 0.1, so that clients on the
+  public tor network prefer to bootstrap off fallback directory mirrors.
+  This is a follow-up to 24679, which removed weights from the default
+  fallbacks.
+  Implements ticket 24681.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 74915b711..b286a0656 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -432,7 +432,8 @@ GENERAL OPTIONS
 When configured to use both directory authorities and fallback
 directories, the directory authorities also work as fallbacks. They are
 chosen with their regular weights, multiplied by this number, which
-should be 1.0 or less. (Default: 1.0)
+should be 1.0 or less. The default is less than 1, to reduce load on
+authorities. (Default: 0.1)
 
 [[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] [**flags**] 
__address__:__port__ __fingerprint__ +
 
diff --git a/src/or/config.c b/src/or/config.c
index 557790a81..2a0d091a2 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -225,7 +225,14 @@ static config_var_t option_vars_[] = {
   VAR("DirReqStatistics",BOOL, DirReqStatistics_option, "1"),
   VAR("DirAuthority",LINELIST, DirAuthorities, NULL),
   V(DirCache,BOOL, "1"),
-  V(DirAuthorityFallbackRate,DOUBLE,   "1.0"),
+  /* A DirAuthorityFallbackRate of 0.1 means that 0.5% of clients try an
+   * authority when all fallbacks are up, and 2% try an authority when 25% of
+   * fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
+   *
+   * We want to reduce load on authorities, but keep these two figures within
+   * an order of magnitude, so there isn't too much load shifting to 
authorities
+   * when fallbacks go down. */
+  V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
   V(DisableAllSwap,  BOOL, "0"),
   V(DisableDebuggerAttachment,   BOOL, "1"),
   V(DisableIOCP, BOOL, "1"),



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

2018-01-05 Thread nickm

commit c52d4d9e3454fd0a94cb900dc18516a489441c18
Merge: c9b3f6352 94d5523c7
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:31 2018 -0500

Merge branch 'teor_ticket24681_028' into maint-0.2.9

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --cc src/or/config.c
index ddf49b037,dd0016f7a..42ff25877
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -226,10 -225,17 +226,17 @@@ static config_var_t option_vars_[] = 
VAR("DirReqStatistics",BOOL, DirReqStatistics_option, "1"),
VAR("DirAuthority",LINELIST, DirAuthorities, NULL),
V(DirCache,BOOL, "1"),
-   V(DirAuthorityFallbackRate,DOUBLE,   "1.0"),
+   /* A DirAuthorityFallbackRate of 0.1 means that 0.5% of clients try an
+* authority when all fallbacks are up, and 2% try an authority when 25% of
+* fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
+*
+* We want to reduce load on authorities, but keep these two figures within
+* an order of magnitude, so there isn't too much load shifting to
+* authorities when fallbacks go down. */
+   V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
V(DisableAllSwap,  BOOL, "0"),
V(DisableDebuggerAttachment,   BOOL, "1"),
 -  V(DisableIOCP, BOOL, "1"),
 +  OBSOLETE("DisableIOCP"),
OBSOLETE("DisableV2DirectoryInfo_"),
OBSOLETE("DynamicDHGroups"),
VPORT(DNSPort, LINELIST, NULL),



___
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] fix a wide line

2018-01-05 Thread nickm

commit 94d5523c7f100a2fc94869c55af6ec8e3429df2a
Author: Nick Mathewson 
Date:   Fri Jan 5 11:28:23 2018 -0500

fix a wide line
---
 src/or/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 2a0d091a2..dd0016f7a 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -230,8 +230,8 @@ static config_var_t option_vars_[] = {
* fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
*
* We want to reduce load on authorities, but keep these two figures within
-   * an order of magnitude, so there isn't too much load shifting to 
authorities
-   * when fallbacks go down. */
+   * an order of magnitude, so there isn't too much load shifting to
+   * authorities when fallbacks go down. */
   V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
   V(DisableAllSwap,  BOOL, "0"),
   V(DisableDebuggerAttachment,   BOOL, "1"),



___
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] fix a wide line

2018-01-05 Thread nickm

commit 94d5523c7f100a2fc94869c55af6ec8e3429df2a
Author: Nick Mathewson 
Date:   Fri Jan 5 11:28:23 2018 -0500

fix a wide line
---
 src/or/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 2a0d091a2..dd0016f7a 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -230,8 +230,8 @@ static config_var_t option_vars_[] = {
* fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
*
* We want to reduce load on authorities, but keep these two figures within
-   * an order of magnitude, so there isn't too much load shifting to 
authorities
-   * when fallbacks go down. */
+   * an order of magnitude, so there isn't too much load shifting to
+   * authorities when fallbacks go down. */
   V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
   V(DisableAllSwap,  BOOL, "0"),
   V(DisableDebuggerAttachment,   BOOL, "1"),



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

[tor-commits] [tor/master] fix a wide line

2018-01-05 Thread nickm

commit 94d5523c7f100a2fc94869c55af6ec8e3429df2a
Author: Nick Mathewson 
Date:   Fri Jan 5 11:28:23 2018 -0500

fix a wide line
---
 src/or/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 2a0d091a2..dd0016f7a 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -230,8 +230,8 @@ static config_var_t option_vars_[] = {
* fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
*
* We want to reduce load on authorities, but keep these two figures within
-   * an order of magnitude, so there isn't too much load shifting to 
authorities
-   * when fallbacks go down. */
+   * an order of magnitude, so there isn't too much load shifting to
+   * authorities when fallbacks go down. */
   V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
   V(DisableAllSwap,  BOOL, "0"),
   V(DisableDebuggerAttachment,   BOOL, "1"),



___
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-05 Thread nickm

commit 48d94e290dec5a5563d8ba97754b98f4374e9566
Merge: c1d98c75e 16fd975a8
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-01-05 Thread nickm

commit 3618bd6166002c7aadbb832d8a3e8bdba193f00c
Merge: 9ef97a268 48d94e290
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --cc doc/tor.1.txt
index fc285ebe1,c4c569836..a319aa938
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@@ -466,11 -450,12 +466,12 @@@ GENERAL OPTION
  When configured to use both directory authorities and fallback
  directories, the directory authorities also work as fallbacks. They are
  chosen with their regular weights, multiplied by this number, which
- should be 1.0 or less. (Default: 1.0)
+ should be 1.0 or less. The default is less than 1, to reduce load on
+ authorities. (Default: 0.1)
  
 -[[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] 
[**flags**] __address__:__port__ __fingerprint__ +
 +[[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] 
[**flags**] __ipv4address__:__port__ __fingerprint__ +
  
 -[[AlternateBridgeAuthority]] **AlternateBridgeAuthority** [__nickname__] 
[**flags**] __address__:__port__ __ fingerprint__::
 +[[AlternateBridgeAuthority]] **AlternateBridgeAuthority** [__nickname__] 
[**flags**] __ipv4address__:__port__ __ fingerprint__::
  These options behave as DirAuthority, but they replace fewer of the
  default directory authorities. Using
  AlternateDirAuthority replaces the default Tor directory authorities, but

___
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-05 Thread nickm

commit 7c411bba8a81b545e377af18ecd47f7de23a2dbc
Merge: 72c2292ef 16fd975a8
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 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.2'

2018-01-05 Thread nickm

commit 0b6fe3c1230a7d135a6a5541b2abb8f6641cc48e
Merge: 2d92f4c19 3618bd616
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:35 2018 -0500

Merge branch 'maint-0.3.2'

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 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/release-0.2.9] Make the default DirAuthorityFallbackRate 0.1

2018-01-05 Thread nickm

commit 30e13716754bc3d991500f5f68eb83a19aea9b11
Author: teor 
Date:   Sat Dec 23 00:00:18 2017 +1100

Make the default DirAuthorityFallbackRate 0.1

This makes clients on the public tor network prefer to bootstrap off 
fallback
directory mirrors.

This is a follow-up to 24679, which removed weights from the default 
fallbacks.

Implements ticket 24681.
---
 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/changes/ticket24681 b/changes/ticket24681
new file mode 100644
index 0..cc0a42b2e
--- /dev/null
+++ b/changes/ticket24681
@@ -0,0 +1,6 @@
+  o Minor features (fallback directory mirrors):
+- Make the default DirAuthorityFallbackRate 0.1, so that clients on the
+  public tor network prefer to bootstrap off fallback directory mirrors.
+  This is a follow-up to 24679, which removed weights from the default
+  fallbacks.
+  Implements ticket 24681.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 74915b711..b286a0656 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -432,7 +432,8 @@ GENERAL OPTIONS
 When configured to use both directory authorities and fallback
 directories, the directory authorities also work as fallbacks. They are
 chosen with their regular weights, multiplied by this number, which
-should be 1.0 or less. (Default: 1.0)
+should be 1.0 or less. The default is less than 1, to reduce load on
+authorities. (Default: 0.1)
 
 [[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] [**flags**] 
__address__:__port__ __fingerprint__ +
 
diff --git a/src/or/config.c b/src/or/config.c
index 557790a81..2a0d091a2 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -225,7 +225,14 @@ static config_var_t option_vars_[] = {
   VAR("DirReqStatistics",BOOL, DirReqStatistics_option, "1"),
   VAR("DirAuthority",LINELIST, DirAuthorities, NULL),
   V(DirCache,BOOL, "1"),
-  V(DirAuthorityFallbackRate,DOUBLE,   "1.0"),
+  /* A DirAuthorityFallbackRate of 0.1 means that 0.5% of clients try an
+   * authority when all fallbacks are up, and 2% try an authority when 25% of
+   * fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
+   *
+   * We want to reduce load on authorities, but keep these two figures within
+   * an order of magnitude, so there isn't too much load shifting to 
authorities
+   * when fallbacks go down. */
+  V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
   V(DisableAllSwap,  BOOL, "0"),
   V(DisableDebuggerAttachment,   BOOL, "1"),
   V(DisableIOCP, BOOL, "1"),



___
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-05 Thread nickm

commit 3618bd6166002c7aadbb832d8a3e8bdba193f00c
Merge: 9ef97a268 48d94e290
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --cc doc/tor.1.txt
index fc285ebe1,c4c569836..a319aa938
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@@ -466,11 -450,12 +466,12 @@@ GENERAL OPTION
  When configured to use both directory authorities and fallback
  directories, the directory authorities also work as fallbacks. They are
  chosen with their regular weights, multiplied by this number, which
- should be 1.0 or less. (Default: 1.0)
+ should be 1.0 or less. The default is less than 1, to reduce load on
+ authorities. (Default: 0.1)
  
 -[[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] 
[**flags**] __address__:__port__ __fingerprint__ +
 +[[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] 
[**flags**] __ipv4address__:__port__ __fingerprint__ +
  
 -[[AlternateBridgeAuthority]] **AlternateBridgeAuthority** [__nickname__] 
[**flags**] __address__:__port__ __ fingerprint__::
 +[[AlternateBridgeAuthority]] **AlternateBridgeAuthority** [__nickname__] 
[**flags**] __ipv4address__:__port__ __ fingerprint__::
  These options behave as DirAuthority, but they replace fewer of the
  default directory authorities. Using
  AlternateDirAuthority replaces the default Tor directory authorities, 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.2] Make the default DirAuthorityFallbackRate 0.1

2018-01-05 Thread nickm

commit 30e13716754bc3d991500f5f68eb83a19aea9b11
Author: teor 
Date:   Sat Dec 23 00:00:18 2017 +1100

Make the default DirAuthorityFallbackRate 0.1

This makes clients on the public tor network prefer to bootstrap off 
fallback
directory mirrors.

This is a follow-up to 24679, which removed weights from the default 
fallbacks.

Implements ticket 24681.
---
 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/changes/ticket24681 b/changes/ticket24681
new file mode 100644
index 0..cc0a42b2e
--- /dev/null
+++ b/changes/ticket24681
@@ -0,0 +1,6 @@
+  o Minor features (fallback directory mirrors):
+- Make the default DirAuthorityFallbackRate 0.1, so that clients on the
+  public tor network prefer to bootstrap off fallback directory mirrors.
+  This is a follow-up to 24679, which removed weights from the default
+  fallbacks.
+  Implements ticket 24681.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 74915b711..b286a0656 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -432,7 +432,8 @@ GENERAL OPTIONS
 When configured to use both directory authorities and fallback
 directories, the directory authorities also work as fallbacks. They are
 chosen with their regular weights, multiplied by this number, which
-should be 1.0 or less. (Default: 1.0)
+should be 1.0 or less. The default is less than 1, to reduce load on
+authorities. (Default: 0.1)
 
 [[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] [**flags**] 
__address__:__port__ __fingerprint__ +
 
diff --git a/src/or/config.c b/src/or/config.c
index 557790a81..2a0d091a2 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -225,7 +225,14 @@ static config_var_t option_vars_[] = {
   VAR("DirReqStatistics",BOOL, DirReqStatistics_option, "1"),
   VAR("DirAuthority",LINELIST, DirAuthorities, NULL),
   V(DirCache,BOOL, "1"),
-  V(DirAuthorityFallbackRate,DOUBLE,   "1.0"),
+  /* A DirAuthorityFallbackRate of 0.1 means that 0.5% of clients try an
+   * authority when all fallbacks are up, and 2% try an authority when 25% of
+   * fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
+   *
+   * We want to reduce load on authorities, but keep these two figures within
+   * an order of magnitude, so there isn't too much load shifting to 
authorities
+   * when fallbacks go down. */
+  V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
   V(DisableAllSwap,  BOOL, "0"),
   V(DisableDebuggerAttachment,   BOOL, "1"),
   V(DisableIOCP, BOOL, "1"),



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

2018-01-05 Thread nickm

commit c52d4d9e3454fd0a94cb900dc18516a489441c18
Merge: c9b3f6352 94d5523c7
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:31 2018 -0500

Merge branch 'teor_ticket24681_028' into maint-0.2.9

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --cc src/or/config.c
index ddf49b037,dd0016f7a..42ff25877
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -226,10 -225,17 +226,17 @@@ static config_var_t option_vars_[] = 
VAR("DirReqStatistics",BOOL, DirReqStatistics_option, "1"),
VAR("DirAuthority",LINELIST, DirAuthorities, NULL),
V(DirCache,BOOL, "1"),
-   V(DirAuthorityFallbackRate,DOUBLE,   "1.0"),
+   /* A DirAuthorityFallbackRate of 0.1 means that 0.5% of clients try an
+* authority when all fallbacks are up, and 2% try an authority when 25% of
+* fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
+*
+* We want to reduce load on authorities, but keep these two figures within
+* an order of magnitude, so there isn't too much load shifting to
+* authorities when fallbacks go down. */
+   V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
V(DisableAllSwap,  BOOL, "0"),
V(DisableDebuggerAttachment,   BOOL, "1"),
 -  V(DisableIOCP, BOOL, "1"),
 +  OBSOLETE("DisableIOCP"),
OBSOLETE("DisableV2DirectoryInfo_"),
OBSOLETE("DynamicDHGroups"),
VPORT(DNSPort, LINELIST, NULL),



___
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-05 Thread nickm

commit 48d94e290dec5a5563d8ba97754b98f4374e9566
Merge: c1d98c75e 16fd975a8
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 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/maint-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0

2018-01-05 Thread nickm

commit 16fd975a82e502418578c81f04894272c4f11826
Merge: bbc9ff160 c52d4d9e3
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 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/maint-0.3.2] fix a wide line

2018-01-05 Thread nickm

commit 94d5523c7f100a2fc94869c55af6ec8e3429df2a
Author: Nick Mathewson 
Date:   Fri Jan 5 11:28:23 2018 -0500

fix a wide line
---
 src/or/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 2a0d091a2..dd0016f7a 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -230,8 +230,8 @@ static config_var_t option_vars_[] = {
* fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
*
* We want to reduce load on authorities, but keep these two figures within
-   * an order of magnitude, so there isn't too much load shifting to 
authorities
-   * when fallbacks go down. */
+   * an order of magnitude, so there isn't too much load shifting to
+   * authorities when fallbacks go down. */
   V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
   V(DisableAllSwap,  BOOL, "0"),
   V(DisableDebuggerAttachment,   BOOL, "1"),



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

2018-01-05 Thread nickm

commit c52d4d9e3454fd0a94cb900dc18516a489441c18
Merge: c9b3f6352 94d5523c7
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:31 2018 -0500

Merge branch 'teor_ticket24681_028' into maint-0.2.9

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --cc src/or/config.c
index ddf49b037,dd0016f7a..42ff25877
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -226,10 -225,17 +226,17 @@@ static config_var_t option_vars_[] = 
VAR("DirReqStatistics",BOOL, DirReqStatistics_option, "1"),
VAR("DirAuthority",LINELIST, DirAuthorities, NULL),
V(DirCache,BOOL, "1"),
-   V(DirAuthorityFallbackRate,DOUBLE,   "1.0"),
+   /* A DirAuthorityFallbackRate of 0.1 means that 0.5% of clients try an
+* authority when all fallbacks are up, and 2% try an authority when 25% of
+* fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
+*
+* We want to reduce load on authorities, but keep these two figures within
+* an order of magnitude, so there isn't too much load shifting to
+* authorities when fallbacks go down. */
+   V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
V(DisableAllSwap,  BOOL, "0"),
V(DisableDebuggerAttachment,   BOOL, "1"),
 -  V(DisableIOCP, BOOL, "1"),
 +  OBSOLETE("DisableIOCP"),
OBSOLETE("DisableV2DirectoryInfo_"),
OBSOLETE("DynamicDHGroups"),
VPORT(DNSPort, LINELIST, NULL),

___
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-05 Thread nickm

commit 16fd975a82e502418578c81f04894272c4f11826
Merge: bbc9ff160 c52d4d9e3
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 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/maint-0.3.0] Make the default DirAuthorityFallbackRate 0.1

2018-01-05 Thread nickm

commit 30e13716754bc3d991500f5f68eb83a19aea9b11
Author: teor 
Date:   Sat Dec 23 00:00:18 2017 +1100

Make the default DirAuthorityFallbackRate 0.1

This makes clients on the public tor network prefer to bootstrap off 
fallback
directory mirrors.

This is a follow-up to 24679, which removed weights from the default 
fallbacks.

Implements ticket 24681.
---
 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/changes/ticket24681 b/changes/ticket24681
new file mode 100644
index 0..cc0a42b2e
--- /dev/null
+++ b/changes/ticket24681
@@ -0,0 +1,6 @@
+  o Minor features (fallback directory mirrors):
+- Make the default DirAuthorityFallbackRate 0.1, so that clients on the
+  public tor network prefer to bootstrap off fallback directory mirrors.
+  This is a follow-up to 24679, which removed weights from the default
+  fallbacks.
+  Implements ticket 24681.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 74915b711..b286a0656 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -432,7 +432,8 @@ GENERAL OPTIONS
 When configured to use both directory authorities and fallback
 directories, the directory authorities also work as fallbacks. They are
 chosen with their regular weights, multiplied by this number, which
-should be 1.0 or less. (Default: 1.0)
+should be 1.0 or less. The default is less than 1, to reduce load on
+authorities. (Default: 0.1)
 
 [[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] [**flags**] 
__address__:__port__ __fingerprint__ +
 
diff --git a/src/or/config.c b/src/or/config.c
index 557790a81..2a0d091a2 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -225,7 +225,14 @@ static config_var_t option_vars_[] = {
   VAR("DirReqStatistics",BOOL, DirReqStatistics_option, "1"),
   VAR("DirAuthority",LINELIST, DirAuthorities, NULL),
   V(DirCache,BOOL, "1"),
-  V(DirAuthorityFallbackRate,DOUBLE,   "1.0"),
+  /* A DirAuthorityFallbackRate of 0.1 means that 0.5% of clients try an
+   * authority when all fallbacks are up, and 2% try an authority when 25% of
+   * fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
+   *
+   * We want to reduce load on authorities, but keep these two figures within
+   * an order of magnitude, so there isn't too much load shifting to 
authorities
+   * when fallbacks go down. */
+  V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
   V(DisableAllSwap,  BOOL, "0"),
   V(DisableDebuggerAttachment,   BOOL, "1"),
   V(DisableIOCP, BOOL, "1"),



___
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 a wide line

2018-01-05 Thread nickm

commit 94d5523c7f100a2fc94869c55af6ec8e3429df2a
Author: Nick Mathewson 
Date:   Fri Jan 5 11:28:23 2018 -0500

fix a wide line
---
 src/or/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 2a0d091a2..dd0016f7a 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -230,8 +230,8 @@ static config_var_t option_vars_[] = {
* fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
*
* We want to reduce load on authorities, but keep these two figures within
-   * an order of magnitude, so there isn't too much load shifting to 
authorities
-   * when fallbacks go down. */
+   * an order of magnitude, so there isn't too much load shifting to
+   * authorities when fallbacks go down. */
   V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
   V(DisableAllSwap,  BOOL, "0"),
   V(DisableDebuggerAttachment,   BOOL, "1"),



___
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] Make the default DirAuthorityFallbackRate 0.1

2018-01-05 Thread nickm

commit 30e13716754bc3d991500f5f68eb83a19aea9b11
Author: teor 
Date:   Sat Dec 23 00:00:18 2017 +1100

Make the default DirAuthorityFallbackRate 0.1

This makes clients on the public tor network prefer to bootstrap off 
fallback
directory mirrors.

This is a follow-up to 24679, which removed weights from the default 
fallbacks.

Implements ticket 24681.
---
 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/changes/ticket24681 b/changes/ticket24681
new file mode 100644
index 0..cc0a42b2e
--- /dev/null
+++ b/changes/ticket24681
@@ -0,0 +1,6 @@
+  o Minor features (fallback directory mirrors):
+- Make the default DirAuthorityFallbackRate 0.1, so that clients on the
+  public tor network prefer to bootstrap off fallback directory mirrors.
+  This is a follow-up to 24679, which removed weights from the default
+  fallbacks.
+  Implements ticket 24681.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 74915b711..b286a0656 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -432,7 +432,8 @@ GENERAL OPTIONS
 When configured to use both directory authorities and fallback
 directories, the directory authorities also work as fallbacks. They are
 chosen with their regular weights, multiplied by this number, which
-should be 1.0 or less. (Default: 1.0)
+should be 1.0 or less. The default is less than 1, to reduce load on
+authorities. (Default: 0.1)
 
 [[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] [**flags**] 
__address__:__port__ __fingerprint__ +
 
diff --git a/src/or/config.c b/src/or/config.c
index 557790a81..2a0d091a2 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -225,7 +225,14 @@ static config_var_t option_vars_[] = {
   VAR("DirReqStatistics",BOOL, DirReqStatistics_option, "1"),
   VAR("DirAuthority",LINELIST, DirAuthorities, NULL),
   V(DirCache,BOOL, "1"),
-  V(DirAuthorityFallbackRate,DOUBLE,   "1.0"),
+  /* A DirAuthorityFallbackRate of 0.1 means that 0.5% of clients try an
+   * authority when all fallbacks are up, and 2% try an authority when 25% of
+   * fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
+   *
+   * We want to reduce load on authorities, but keep these two figures within
+   * an order of magnitude, so there isn't too much load shifting to 
authorities
+   * when fallbacks go down. */
+  V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
   V(DisableAllSwap,  BOOL, "0"),
   V(DisableDebuggerAttachment,   BOOL, "1"),
   V(DisableIOCP, BOOL, "1"),



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

2018-01-05 Thread nickm

commit c52d4d9e3454fd0a94cb900dc18516a489441c18
Merge: c9b3f6352 94d5523c7
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:31 2018 -0500

Merge branch 'teor_ticket24681_028' into maint-0.2.9

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --cc src/or/config.c
index ddf49b037,dd0016f7a..42ff25877
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -226,10 -225,17 +226,17 @@@ static config_var_t option_vars_[] = 
VAR("DirReqStatistics",BOOL, DirReqStatistics_option, "1"),
VAR("DirAuthority",LINELIST, DirAuthorities, NULL),
V(DirCache,BOOL, "1"),
-   V(DirAuthorityFallbackRate,DOUBLE,   "1.0"),
+   /* A DirAuthorityFallbackRate of 0.1 means that 0.5% of clients try an
+* authority when all fallbacks are up, and 2% try an authority when 25% of
+* fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
+*
+* We want to reduce load on authorities, but keep these two figures within
+* an order of magnitude, so there isn't too much load shifting to
+* authorities when fallbacks go down. */
+   V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
V(DisableAllSwap,  BOOL, "0"),
V(DisableDebuggerAttachment,   BOOL, "1"),
 -  V(DisableIOCP, BOOL, "1"),
 +  OBSOLETE("DisableIOCP"),
OBSOLETE("DisableV2DirectoryInfo_"),
OBSOLETE("DynamicDHGroups"),
VPORT(DNSPort, LINELIST, NULL),



___
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] Make the default DirAuthorityFallbackRate 0.1

2018-01-05 Thread nickm

commit 30e13716754bc3d991500f5f68eb83a19aea9b11
Author: teor 
Date:   Sat Dec 23 00:00:18 2017 +1100

Make the default DirAuthorityFallbackRate 0.1

This makes clients on the public tor network prefer to bootstrap off 
fallback
directory mirrors.

This is a follow-up to 24679, which removed weights from the default 
fallbacks.

Implements ticket 24681.
---
 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/changes/ticket24681 b/changes/ticket24681
new file mode 100644
index 0..cc0a42b2e
--- /dev/null
+++ b/changes/ticket24681
@@ -0,0 +1,6 @@
+  o Minor features (fallback directory mirrors):
+- Make the default DirAuthorityFallbackRate 0.1, so that clients on the
+  public tor network prefer to bootstrap off fallback directory mirrors.
+  This is a follow-up to 24679, which removed weights from the default
+  fallbacks.
+  Implements ticket 24681.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 74915b711..b286a0656 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -432,7 +432,8 @@ GENERAL OPTIONS
 When configured to use both directory authorities and fallback
 directories, the directory authorities also work as fallbacks. They are
 chosen with their regular weights, multiplied by this number, which
-should be 1.0 or less. (Default: 1.0)
+should be 1.0 or less. The default is less than 1, to reduce load on
+authorities. (Default: 0.1)
 
 [[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] [**flags**] 
__address__:__port__ __fingerprint__ +
 
diff --git a/src/or/config.c b/src/or/config.c
index 557790a81..2a0d091a2 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -225,7 +225,14 @@ static config_var_t option_vars_[] = {
   VAR("DirReqStatistics",BOOL, DirReqStatistics_option, "1"),
   VAR("DirAuthority",LINELIST, DirAuthorities, NULL),
   V(DirCache,BOOL, "1"),
-  V(DirAuthorityFallbackRate,DOUBLE,   "1.0"),
+  /* A DirAuthorityFallbackRate of 0.1 means that 0.5% of clients try an
+   * authority when all fallbacks are up, and 2% try an authority when 25% of
+   * fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
+   *
+   * We want to reduce load on authorities, but keep these two figures within
+   * an order of magnitude, so there isn't too much load shifting to 
authorities
+   * when fallbacks go down. */
+  V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
   V(DisableAllSwap,  BOOL, "0"),
   V(DisableDebuggerAttachment,   BOOL, "1"),
   V(DisableIOCP, BOOL, "1"),



___
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] fix a wide line

2018-01-05 Thread nickm

commit 94d5523c7f100a2fc94869c55af6ec8e3429df2a
Author: Nick Mathewson 
Date:   Fri Jan 5 11:28:23 2018 -0500

fix a wide line
---
 src/or/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 2a0d091a2..dd0016f7a 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -230,8 +230,8 @@ static config_var_t option_vars_[] = {
* fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
*
* We want to reduce load on authorities, but keep these two figures within
-   * an order of magnitude, so there isn't too much load shifting to 
authorities
-   * when fallbacks go down. */
+   * an order of magnitude, so there isn't too much load shifting to
+   * authorities when fallbacks go down. */
   V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
   V(DisableAllSwap,  BOOL, "0"),
   V(DisableDebuggerAttachment,   BOOL, "1"),



___
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-05 Thread nickm

commit 16fd975a82e502418578c81f04894272c4f11826
Merge: bbc9ff160 c52d4d9e3
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 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/maint-0.3.0] Merge branch 'teor_ticket24681_028' into maint-0.2.9

2018-01-05 Thread nickm

commit c52d4d9e3454fd0a94cb900dc18516a489441c18
Merge: c9b3f6352 94d5523c7
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:31 2018 -0500

Merge branch 'teor_ticket24681_028' into maint-0.2.9

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --cc src/or/config.c
index ddf49b037,dd0016f7a..42ff25877
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -226,10 -225,17 +226,17 @@@ static config_var_t option_vars_[] = 
VAR("DirReqStatistics",BOOL, DirReqStatistics_option, "1"),
VAR("DirAuthority",LINELIST, DirAuthorities, NULL),
V(DirCache,BOOL, "1"),
-   V(DirAuthorityFallbackRate,DOUBLE,   "1.0"),
+   /* A DirAuthorityFallbackRate of 0.1 means that 0.5% of clients try an
+* authority when all fallbacks are up, and 2% try an authority when 25% of
+* fallbacks are down. (We rebuild the list when 25% of fallbacks are down).
+*
+* We want to reduce load on authorities, but keep these two figures within
+* an order of magnitude, so there isn't too much load shifting to
+* authorities when fallbacks go down. */
+   V(DirAuthorityFallbackRate,DOUBLE,   "0.1"),
V(DisableAllSwap,  BOOL, "0"),
V(DisableDebuggerAttachment,   BOOL, "1"),
 -  V(DisableIOCP, BOOL, "1"),
 +  OBSOLETE("DisableIOCP"),
OBSOLETE("DisableV2DirectoryInfo_"),
OBSOLETE("DynamicDHGroups"),
VPORT(DNSPort, LINELIST, NULL),



___
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

2018-01-05 Thread translation

commit 2246f51684a70366d7800f450b1bb1cfd832b356
Author: Translation commit bot 
Date:   Fri Jan 5 20:45:32 2018 +

Update translations for whisperback_completed
---
 zh_CN/zh_CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index 6d78a5794..425d52713 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -14,7 +14,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-12-07 07:12+\n"
+"PO-Revision-Date: 2018-01-05 20:43+\n"
 "Last-Translator: khi\n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\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/whisperback] Update translations for whisperback

2018-01-05 Thread translation

commit 7ae27b55175bafb94ae3d56e7397e8c53bb5c57f
Author: Translation commit bot 
Date:   Fri Jan 5 20:45:26 2018 +

Update translations for whisperback
---
 zh_CN/zh_CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index 6d78a5794..425d52713 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -14,7 +14,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-12-07 07:12+\n"
+"PO-Revision-Date: 2018-01-05 20:43+\n"
 "Last-Translator: khi\n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\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/tor-browser-manual] Update translations for tor-browser-manual

2018-01-05 Thread translation

commit 2724c15e22c5d0ac8e6271246c31ce69363d5e52
Author: Translation commit bot 
Date:   Fri Jan 5 20:20:44 2018 +

Update translations for tor-browser-manual
---
 ru/ru.po | 23 ---
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/ru/ru.po b/ru/ru.po
index b598faee5..2298dba60 100644
--- a/ru/ru.po
+++ b/ru/ru.po
@@ -9,6 +9,7 @@
 # Klayman , 2016
 # Dmitriy Glian , 2016
 # Eugene , 2016
+# Yanis Voloshin , 2016
 # Misha Dyachuk , 2016
 # starius , 2016
 # Bahaa Abu Diak , 2017
@@ -37,19 +38,20 @@ msgstr "ÐÐµÑÐµÐ²Ð¾Ð´ÑÐ¸ÐºÐ¸"
 #: about-tor-browser.page:7
 msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
-"Ð£Ð·Ð½Ð°Ð¹ÑÐµ, ÑÑÐ¾ Ð¼Ð¾Ð¶ÐµÑ Tor Browser, Ð´Ð»Ñ Ð·Ð°ÑÐ¸ÑÑ Ð²Ð°ÑÐµÐ¹ 
Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð¸ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾ÑÑÐ¸."
+"Ð£Ð·Ð½Ð°Ð¹ÑÐµ, ÑÑÐ¾ Ð¼Ð¾Ð¶ÐµÑ ÑÐ´ÐµÐ»Ð°ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑ Tor, 
ÑÑÐ¾Ð±Ñ Ð·Ð°ÑÐ¸ÑÐ¸ÑÑ ÐÐ°ÑÑ "
+"ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÑ Ð¸ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾ÑÑÑ"
 
 #: about-tor-browser.page:10
 msgid "About Tor Browser"
-msgstr "Ð Tor Browser"
+msgstr "Ð Ð±ÑÐ°ÑÐ·ÐµÑÐµ Tor"
 
 #: about-tor-browser.page:12
 msgid ""
 "Tor Browser uses the Tor network to protect your privacy and anonymity. "
 "Using the Tor network has two main properties:"
 msgstr ""
-"Tor Browser Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑ ÑÐµÑÑ Tor Ð´Ð»Ñ Ð·Ð°ÑÐ¸ÑÑ Ð²Ð°ÑÐµÐ¹ 
ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÐ¸ Ð¸ "
-"Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾ÑÑÐ¸. ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ ÑÐµÑÐ¸ Tor Ð¸Ð¼ÐµÐµÑ 
Ð´Ð²Ð° Ð¾ÑÐ½Ð¾Ð²Ð½ÑÑ ÑÐ²Ð¾Ð¹ÑÑÐ²Ð°:"
+"ÐÑÐ°ÑÐ·ÐµÑ Tor Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑ ÑÐµÑÑ Tor ÑÑÐ¾Ð±Ñ 
Ð·Ð°ÑÐ¸ÑÐ¸ÑÑ ÐÐ°ÑÐ¸ ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÑ Ð¸ "
+"Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾ÑÑÑ. ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ ÑÐµÑÐ¸ Tor Ð¸Ð¼ÐµÐµÑ 
Ð´Ð²Ð° Ð¾ÑÐ½Ð¾Ð²Ð½ÑÑ ÑÐ²Ð¾Ð¹ÑÑÐ²Ð°:"
 
 #: about-tor-browser.page:18
 msgid ""
@@ -57,8 +59,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 ""
@@ -1392,6 +1395,8 @@ msgid ""
 "Your computerâs system clock must be set correctly, or Tor will not be able 
"
 "to connect."
 msgstr ""
+"Ð¡Ð¸ÑÑÐµÐ¼Ð½Ð¾Ðµ Ð²ÑÐµÐ¼Ñ ÐÐ°ÑÐµÐ³Ð¾ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ° Ð´Ð¾Ð»Ð¶Ð½Ð¾ 
Ð±ÑÑÑ Ð²ÑÑÑÐ°Ð²Ð»ÐµÐ½Ð¾ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾, Ð¸Ð½Ð°ÑÐµ "
+"Tor Ð½Ðµ ÑÐ¼Ð¾Ð¶ÐµÑ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ¸ÑÑÑÑ Ðº Ð¡ÐµÑÐ¸."
 
 #: troubleshooting.page:35
 msgid ""
@@ -1443,7 +1448,7 @@ msgstr ""
 
 #: uninstalling.page:6
 msgid "How to remove Tor Browser from your system"
-msgstr "ÐÐ°Ðº ÑÐ´Ð°Ð»Ð¸ÑÑ Tor Browser Ð¸Ð· Ð²Ð°ÑÐµÐ¹ ÑÐ¸ÑÑÐµÐ¼Ñ"
+msgstr "ÐÐ°Ðº ÑÐ´Ð°Ð»Ð¸ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑ Tor Ð¸Ð· ÐÐ°ÑÐµÐ¹ 
ÑÐ¸ÑÑÐµÐ¼Ñ"
 
 #: uninstalling.page:10
 msgid "Uninstalling"
@@ -1484,6 +1489,8 @@ msgstr "ÐÑÐ¸ÑÑÐ¸ÑÑ ÐºÐ¾ÑÐ·Ð¸Ð½Ñ"
 msgid ""
 "Note that your operating systemâs standard âUninstallâ utility is not 
used."
 msgstr ""
+"ÐÐ±ÑÐ°ÑÐ¸ÑÐµ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ Ð½Ð° ÑÐ¾, ÑÑÐ¾ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð°Ñ 
ÑÑÐ¸Ð»Ð¸ÑÐ° \"ÐÐµÐ¸Ð½ÑÑÐ°Ð»Ð»ÑÑÐ¸Ñ\" Ð½Ðµ "
+"Ð·Ð°Ð´ÐµÐ¹ÑÑÐ²ÑÐµÑÑÑ."
 
 #: updating.page:6
 msgid "How to update Tor Browser"
@@ -1549,6 +1556,8 @@ msgid ""
 "When Tor Browser has finished checking for updates, click on the âUpdateâ 
"
 "button."
 msgstr ""
+"ÐÐ¾Ð³Ð´Ð° Ð±ÑÐ°ÑÐ·ÐµÑ Tor Ð¿ÑÐ¾Ð²ÐµÑÐ¸Ñ Ð´Ð¾ÑÑÑÐ¿Ð½Ð¾ÑÑÑ 
Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ, Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ Ð½Ð° ÐºÐ½Ð¾Ð¿ÐºÑ "
+"\"ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ\"."
 
 #. 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/tails-greeter-2_completed] Update translations for tails-greeter-2_completed

2018-01-05 Thread translation

commit 6fbc98ef88724cea584509a7e4fc3d6d0562be2f
Author: Translation commit bot 
Date:   Fri Jan 5 20:20:29 2018 +

Update translations for tails-greeter-2_completed
---
 ru/ru.po | 218 ---
 1 file changed, 124 insertions(+), 94 deletions(-)

diff --git a/ru/ru.po b/ru/ru.po
index e671498a6..f797c8b9e 100644
--- a/ru/ru.po
+++ b/ru/ru.po
@@ -1,16 +1,16 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers , 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+\n"
+"POT-Creation-Date: 2017-09-15 21:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Oleg Sergeev , 2016\n"
+"Last-Translator: Yanis Voloshin , 2018\n"
 "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -92,88 +92,105 @@ msgstr "ÐÐ¾Ð´Ð¼ÐµÐ½Ð° Ð²ÑÐµÑ MAC-Ð°Ð´ÑÐµÑÐ¾Ð² (Ð¿Ð¾ 
ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ)"
 msgid "Don't spoof MAC addresses"
 msgstr "ÐÐµ Ð¿Ð¾Ð´Ð¼ÐµÐ½ÑÑÑ MAC-Ð°Ð´ÑÐµÑÐ°"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð¾ÑÐºÑÑÑÑ Ð·Ð°ÑÐ¸ÑÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ðµ Ñ
ÑÐ°Ð½Ð¸Ð»Ð¸ÑÐµ Ñ ÑÑÐ¾Ð¹ ÐºÐ»ÑÑÐµÐ²Ð¾Ð¹ ÑÑÐ°Ð·Ð¾Ð¹."
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"ÐÑ ÑÐ¼Ð¾Ð¶ÐµÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¸ÑÑ Ð¼Ð¾ÑÑ Tor Ð¸ Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÐ¹ 
Ð¿ÑÐ¾ÐºÑÐ¸ Ð¿Ð¾ÑÐ»Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ Ðº ÑÐµÑÐ¸."
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "ÐÐ¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ Ð² Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on Take a Tour above"
 msgstr ""
 "Ð§ÑÐ¾Ð±Ñ Ð¿Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼Ð¸ÑÑÑÑ Ñ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ°Ð¼Ð¸ Tails, 
Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ Ð½Ð° Take a Tour Ð²ÑÑÐµ"
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "Ð¯Ð·ÑÐº Ð¸ ÑÐµÐ³Ð¸Ð¾Ð½"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÑÐ·ÑÐº Ð¸ ÑÐµÐ³Ð¸Ð¾Ð½Ð°Ð»ÑÐ½ÑÐµ 
Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸"
 
-#: ../data/greeter.ui.h:23
-msgid "Language"
-msgstr "Ð¯Ð·ÑÐº"
-
-#: ../data/greeter.ui.h:24
-msgid "Keyboard Layout"
-msgstr "Ð Ð°ÑÐºÐ»Ð°Ð´ÐºÐ° ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ"
-
 #: ../data/greeter.ui.h:25
-msgid "Formats"
-msgstr "Ð¤Ð¾ÑÐ¼Ð°ÑÑ"
+msgid "_Language"
+msgstr "_Ð¯Ð·ÑÐº"
 
 #: ../data/greeter.ui.h:26
-msgid "Time Zone"
-msgstr "Ð§Ð°ÑÐ¾Ð²Ð¾Ð¹ Ð¿Ð¾ÑÑ"
+msgid "_Keyboard Layout"
+msgstr "_Ð Ð°ÑÐºÐ»Ð°Ð´ÐºÐ° ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ"
 
 #: ../data/greeter.ui.h:27
-msgid "Encrypted Persistent Storage"
-msgstr "ÐÐ°ÑÐ¸ÑÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ðµ Ð¿Ð¾ÑÑÐ¾ÑÐ½Ð½Ð¾Ðµ ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÐµ"
+msgid "_Formats"
+msgstr "_Ð¤Ð¾ÑÐ¼Ð°ÑÑ"
 
 #: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr "_Ð§Ð°ÑÐ¾Ð²Ð¾Ð¹ Ð¿Ð¾ÑÑ"
+
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr "ÐÐ°ÑÐ¸ÑÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ðµ _ÐÐ¾ÑÑÐ¾ÑÐ½Ð½Ð¾Ðµ Ð¥ÑÐ°Ð½Ð¸Ð»Ð¸ÑÐµ"
+
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ ÐºÐ»ÑÑÐµÐ²ÑÑ ÑÑÐ°Ð·Ñ:"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¸ÑÑ Ð¿Ð¾ÑÑÐ¾ÑÐ½Ð½Ð¾Ðµ ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÐµ"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð²Ð°ÑÑ ÐºÐ»ÑÑÐµÐ²ÑÑ ÑÑÐ°Ð·Ñ Ð´Ð»Ñ 
ÑÐ°Ð·Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐ¸ Ð¿Ð¾ÑÑÐ¾ÑÐ½Ð½Ð¾Ð³Ð¾ ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÐ°"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
 msgid "Unlock"
 msgstr "Ð Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "ÐÐ°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¿Ð¾ÑÑÐ¾ÑÐ½Ð½Ð¾Ðµ ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÐµ"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
-msgid "Additional Settings"
-msgstr "ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸"
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is

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

2018-01-05 Thread translation

commit 86a36610fa28126ad1e7f32d1d5c956fd3af26a2
Author: Translation commit bot 
Date:   Fri Jan 5 20:20:23 2018 +

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

diff --git a/ru/ru.po b/ru/ru.po
index 7a53417a6..f797c8b9e 100644
--- a/ru/ru.po
+++ b/ru/ru.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-15 21:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Misha Dyachuk , 2017\n"
+"Last-Translator: Yanis Voloshin , 2018\n"
 "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -133,19 +133,19 @@ 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"
-msgstr ""
+msgstr "ÐÐ°ÑÐ¸ÑÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ðµ _ÐÐ¾ÑÑÐ¾ÑÐ½Ð½Ð¾Ðµ Ð¥ÑÐ°Ð½Ð¸Ð»Ð¸ÑÐµ"
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -176,7 +176,7 @@ msgstr ""
 
 #: ../data/greeter.ui.h:36
 msgid "_Additional Settings"
-msgstr ""
+msgstr "_ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸"
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -223,7 +223,7 @@ msgstr ""
 
 #: ../data/greeter.ui.h:45
 msgid "_Administration Password"
-msgstr ""
+msgstr "_ÐÐ°ÑÐ¾Ð»Ñ ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ°"
 
 #: ../data/greeter.ui.h:46
 msgid "Off (default)"
@@ -231,7 +231,7 @@ msgstr "ÐÑÐºÐ»ÑÑÐ¸ÑÑ (Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ)"
 
 #: ../data/greeter.ui.h:47
 msgid "_MAC Address Spoofing"
-msgstr ""
+msgstr "_ÐÐ¾Ð´Ð¼ÐµÐ½Ð° MAC-Ð°Ð´ÑÐµÑÐ°"
 
 #: ../data/greeter.ui.h:48
 msgid "On (default)"
@@ -247,7 +247,7 @@ msgstr "ÐÑÑÐ¼Ð¾Ð¹ (Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ)"
 
 #: ../data/greeter.ui.h:51
 msgid "_Windows Camouflage"
-msgstr ""
+msgstr "_ÐÐ°ÑÐºÐ¸ÑÐ¾Ð²ÐºÐ° Ð¿Ð¾Ð´ Windows"
 
 #: ../tailsgreeter/gui.py:391
 msgid "Bridge & Proxy"
@@ -293,7 +293,7 @@ msgstr "_ÐÐ°Ð¿ÑÑÐº Tails"
 #. Gtk translation)
 #: ../tailsgreeter/language.py:133
 msgid "default:LTR"
-msgstr ""
+msgstr "Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ:LTR"
 
 #: ../tailsgreeter/persistence.py:89
 #, python-brace-format

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

[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed

2018-01-05 Thread translation

commit 6e0f9629b8711d7fd1b1c40f97619743dd30c6f7
Author: Translation commit bot 
Date:   Fri Jan 5 20:18:43 2018 +

Update translations for torbutton-abouttorproperties_completed
---
 ru/abouttor.properties | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/ru/abouttor.properties b/ru/abouttor.properties
index 2c1cba68d..d9ea5d4a5 100644
--- a/ru/abouttor.properties
+++ b/ru/abouttor.properties
@@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=ÐÑÐ¸ÑÐµÐ±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ Ñ https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
+
+aboutTor.donationBanner.donate=ÐÐ¾Ð¶ÐµÑÑÐ²Ð¾Ð²Ð°ÑÑ ÑÐµÐ¹ÑÐ°Ñ!
+
+aboutTor.donationBanner.slogan=Tor: ÑÑÐ¸Ð»Ð¸Ð²Ð°Ñ ÑÐ¸ÑÑÐ¾Ð²Ð¾Ðµ 
ÑÐ¾Ð¿ÑÐ¾ÑÐ¸Ð²Ð»ÐµÐ½Ð¸Ðµ
+aboutTor.donationBanner.mozilla=ÐÐ¾Ð¶ÐµÑÑÐ²ÑÐ¹ÑÐµ ÑÐµÐ³Ð¾Ð´Ð½Ñ Ð¸ 
Mozilla ÑÐ´Ð²Ð¾Ð¸Ñ ÐÐ°Ñ Ð²Ð·Ð½Ð¾Ñ.
+
+aboutTor.donationBanner.tagline1=ÐÐ°ÑÐ¸ÑÐ° Ð¶ÑÑÐ½Ð°Ð»Ð¸ÑÑÐ¾Ð², 
Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¾ÑÐ¾Ð² Ð¸ Ð°ÐºÑÐ¸Ð²Ð¸ÑÑÐ¾Ð² Ñ 2006 Ð³Ð¾Ð´Ð°
+aboutTor.donationBanner.tagline2=Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð° ÑÐµÑÐ¸ Ð²Ð¾ Ð²ÑÑÐ¼ Ð¼Ð¸ÑÐµ
+aboutTor.donationBanner.tagline3=Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð° Ð² ÑÐµÑÐ¸
+aboutTor.donationBanner.tagline4=Ð¡Ð¾Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ ÑÐ°Ð·Ð²Ð¸ÑÐ¸Ñ 
Ð±ÐµÐ·Ð³ÑÐ°Ð½Ð¸ÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¼Ð¾Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð²Ð¾ ÐÑÐµÐ¼Ð¸ÑÐ½Ð¾Ð¹ 
Ð¡ÐµÑÐ¸.
+aboutTor.donationBanner.tagline5=ÐÐ°ÑÐ¸ÑÐ°Ñ 
ÐÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÑ Ð¼Ð¸Ð»Ð»Ð¸Ð¾Ð½Ð¾Ð² ÐºÐ°Ð¶Ð´ÑÐ¹ Ð´ÐµÐ½Ñ

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

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2018-01-05 Thread translation

commit aa4c340782bd533c8d62d353aa94e9ec24c2289c
Author: Translation commit bot 
Date:   Fri Jan 5 20:18:36 2018 +

Update translations for torbutton-abouttorproperties
---
 ru/abouttor.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ru/abouttor.properties b/ru/abouttor.properties
index c5c3d3c5c..d9ea5d4a5 100644
--- a/ru/abouttor.properties
+++ b/ru/abouttor.properties
@@ -8,13 +8,13 @@ 
aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
-aboutTor.donationBanner.donate=ÐÐ¾Ð¶ÐµÑÑÐ²Ð¾Ð²Ð°ÑÑ!
+aboutTor.donationBanner.donate=ÐÐ¾Ð¶ÐµÑÑÐ²Ð¾Ð²Ð°ÑÑ ÑÐµÐ¹ÑÐ°Ñ!
 
 aboutTor.donationBanner.slogan=Tor: ÑÑÐ¸Ð»Ð¸Ð²Ð°Ñ ÑÐ¸ÑÑÐ¾Ð²Ð¾Ðµ 
ÑÐ¾Ð¿ÑÐ¾ÑÐ¸Ð²Ð»ÐµÐ½Ð¸Ðµ
-aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift!
+aboutTor.donationBanner.mozilla=ÐÐ¾Ð¶ÐµÑÑÐ²ÑÐ¹ÑÐµ ÑÐµÐ³Ð¾Ð´Ð½Ñ Ð¸ 
Mozilla ÑÐ´Ð²Ð¾Ð¸Ñ ÐÐ°Ñ Ð²Ð·Ð½Ð¾Ñ.
 
 aboutTor.donationBanner.tagline1=ÐÐ°ÑÐ¸ÑÐ° Ð¶ÑÑÐ½Ð°Ð»Ð¸ÑÑÐ¾Ð², 
Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¾ÑÐ¾Ð² Ð¸ Ð°ÐºÑÐ¸Ð²Ð¸ÑÑÐ¾Ð² Ñ 2006 Ð³Ð¾Ð´Ð°
 aboutTor.donationBanner.tagline2=Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð° ÑÐµÑÐ¸ Ð²Ð¾ Ð²ÑÑÐ¼ Ð¼Ð¸ÑÐµ
 aboutTor.donationBanner.tagline3=Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð° Ð² ÑÐµÑÐ¸
-aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide
-aboutTor.donationBanner.tagline5=ÐÐ°ÑÐ¸ÑÐ° 
ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÐ¸ Ð¼Ð¸Ð»Ð»Ð¸Ð¾Ð½Ð¾Ð² ÐºÐ°Ð¶Ð´ÑÐ¹ Ð´ÐµÐ½Ñ
+aboutTor.donationBanner.tagline4=Ð¡Ð¾Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ ÑÐ°Ð·Ð²Ð¸ÑÐ¸Ñ 
Ð±ÐµÐ·Ð³ÑÐ°Ð½Ð¸ÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¼Ð¾Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð²Ð¾ ÐÑÐµÐ¼Ð¸ÑÐ½Ð¾Ð¹ 
Ð¡ÐµÑÐ¸.
+aboutTor.donationBanner.tagline5=ÐÐ°ÑÐ¸ÑÐ°Ñ 
ÐÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÑ Ð¼Ð¸Ð»Ð»Ð¸Ð¾Ð½Ð¾Ð² ÐºÐ°Ð¶Ð´ÑÐ¹ Ð´ÐµÐ½Ñ

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

commit 6383bde319a83344a242db065c5aa09de47ca47c
Author: Translation commit bot 
Date:   Fri Jan 5 18:46:58 2018 +

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

diff --git a/fa/network-settings.dtd b/fa/network-settings.dtd
index f2e3d2bab..728bf00f7 100644
--- a/fa/network-settings.dtd
+++ b/fa/network-settings.dtd
@@ -1,6 +1,6 @@
 
-
-
+
+
 
 
 
@@ -47,7 +47,7 @@
 
 
 
-
+
 
 
 

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

1 2 >

1 - 100 of 117 matches

Mail list logo