[tor-commits] [tor/maint-0.2.8] Merge branch 'bug19071-extra-squashed' into maint-0.2.8

2016-06-28 Thread nickm 
commit 2c9354fc1087c8b0bbfa7273106195e74540c731
Merge: bc9a0f8 26146db
Author: Nick Mathewson 
Date:   Tue Jun 28 19:15:20 2016 -0400

Merge branch 'bug19071-extra-squashed' into maint-0.2.8

 changes/ticket19071-19480   |  3 ++
 scripts/maint/fallback.whitelist|  4 +--
 scripts/maint/updateFallbackDirs.py |  9 +++--
 src/or/fallback_dirs.inc| 67 +++--
 4 files changed, 47 insertions(+), 36 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.2.8] Comment-out fallbacks in a way the stem fallback parser understands

2016-06-28 Thread nickm 
commit 26146dbe9eb2404274b7c51121710f3f3529c930
Author: teor (Tim Wilson-Brown) 
Date:   Thu Jun 23 10:49:03 2016 +1000

Comment-out fallbacks in a way the stem fallback parser understands

If we manually remove fallbacks in C by adding '/*' and '*/' on separate
lines, stem still parses them as being present, because it only looks at
the start of a line.

Add a comment to this effect in the generated source code.
---
 changes/ticket19071-19480   |  3 ++
 scripts/maint/updateFallbackDirs.py |  9 +++--
 src/or/fallback_dirs.inc| 67 +++--
 3 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/changes/ticket19071-19480 b/changes/ticket19071-19480
index 3366f82..ab5c72a 100644
--- a/changes/ticket19071-19480
+++ b/changes/ticket19071-19480
@@ -5,6 +5,9 @@
   o Minor features (fallback directory list):
 - Update hard-coded fallback list to remove unsuitable fallbacks.
   Resolves ticket 19071. Patch by teor.
+- Add a comment to the generated list that explains how to comment-out
+  unsuitable fallbacks in a way that's compatible with the stem fallback
+  parser.
 - Update fallback whitelist and blacklist based on relay operator
   emails. Blacklist unsuitable fallbacks. Resolves ticket 19071.
   Patch by teor.
diff --git a/scripts/maint/updateFallbackDirs.py 
b/scripts/maint/updateFallbackDirs.py
index d17e702..110ecda 100755
--- a/scripts/maint/updateFallbackDirs.py
+++ b/scripts/maint/updateFallbackDirs.py
@@ -1828,20 +1828,25 @@ 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)
 #  min & max fallback bandwidths
 #  #error if below minimum count
 if PERFORM_IPV4_DIRPORT_CHECKS or PERFORM_IPV6_DIRPORT_CHECKS:
-  s = '/* Checked %s%s%s DirPorts served a consensus within %.1fs. */'%(
+  s += '/* Checked %s%s%s DirPorts served a consensus within %.1fs. */'%(
 'IPv4' if PERFORM_IPV4_DIRPORT_CHECKS else '',
 ' and ' if (PERFORM_IPV4_DIRPORT_CHECKS
 and PERFORM_IPV6_DIRPORT_CHECKS) else '',
 'IPv6' if PERFORM_IPV6_DIRPORT_CHECKS else '',
 CONSENSUS_DOWNLOAD_SPEED_MAX)
 else:
-  s = '/* Did not check IPv4 or IPv6 DirPort consensus downloads. */'
+  s += '/* Did not check IPv4 or IPv6 DirPort consensus downloads. */'
 s += '\n'
 # Multiline C comment with #error if things go bad
 s += '/*'
diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc
index e422940..e4959f2 100644
--- a/src/or/fallback_dirs.inc
+++ b/src/or/fallback_dirs.inc
@@ -1,3 +1,4 @@
+/* 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.) */
 /* Whitelist & blacklist excluded 1273 of 1553 candidates. */
 /* Checked IPv4 DirPorts served a consensus within 15.0s. */
 /*
@@ -41,9 +42,9 @@ URL: 
https:onionoo.torproject.orguptime?first_seen_days=7-=V2Dir=relay
 "185.61.138.18:8080 orport=4443 id=2541759BEC04D37811C2209A88E863320271EC9C"
 " weight=10",
 /* Fallback was on 0.2.8.2-alpha list, but went down before 0.2.8.5
-"51.254.215.121:80 orport=443 id=262B66AD25C79588AD1FC8ED0E966395B47E5C1D"
-" weight=10",
-*/
+ * "51.254.215.121:80 orport=443 id=262B66AD25C79588AD1FC8ED0E966395B47E5C1D"
+ * " weight=10",
+ */
 "194.150.168.79:2 orport=1 id=29F1020B94BE25E6BE1AD13E93CE19D2131B487C"
 " weight=10",
 "144.76.26.175:9012 orport=9011 id=2BA2C8E96B2590E1072AECE2BDB5C48921BF8510"
@@ -93,9 +94,9 @@ URL: 
https:onionoo.torproject.orguptime?first_seen_days=7-=V2Dir=relay
 "78.142.142.246:80 orport=443 id=5A5E03355C1908EBF424CAF1F3ED70782C0D2F74"
 " weight=10",
 /* Fallback was on 0.2.8.2-alpha list, but went down before 0.2.8.5
-"185.100.85.138:80 orport=46356 id=5C4DF16A0029CC4F67D3E127356E68F219269859"
-" weight=10",
-*/
+ * "185.100.85.138:80 orport=46356 id=5C4DF16A0029CC4F67D3E127356E68F219269859"
+ * " weight=10",
+ */
 "178.16.208.62:80 orport=443 id=5CF8AFA5E4B0BB88942A44A3F3AAE08C3BDFD60B"
 " ipv6=[2a00:1c20:4089:1234:a6a4:2926:d0af:dfee]:443"
 " weight=10",
@@ -125,21 +126,21 @@ URL: 
https:onionoo.torproject.orguptime?first_seen_days=7-=V2Dir=relay
 "192.87.28.82:9030 orport=9001 id=844AE9CAD04325E955E2BE1521563B79FE7094B7"
 " weight=10",
 /* 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"
-" weight=10",
-*/
+

[tor-commits] [tor/master] Merge branch 'bug19071-extra-squashed' into maint-0.2.8

2016-06-28 Thread nickm 
commit 2c9354fc1087c8b0bbfa7273106195e74540c731
Merge: bc9a0f8 26146db
Author: Nick Mathewson 
Date:   Tue Jun 28 19:15:20 2016 -0400

Merge branch 'bug19071-extra-squashed' into maint-0.2.8

 changes/ticket19071-19480   |  3 ++
 scripts/maint/fallback.whitelist|  4 +--
 scripts/maint/updateFallbackDirs.py |  9 +++--
 src/or/fallback_dirs.inc| 67 +++--
 4 files changed, 47 insertions(+), 36 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.8] Merge branch 'bug19071-extra-squashed' into maint-0.2.8

2016-06-28 Thread nickm 
commit 2c9354fc1087c8b0bbfa7273106195e74540c731
Merge: bc9a0f8 26146db
Author: Nick Mathewson 
Date:   Tue Jun 28 19:15:20 2016 -0400

Merge branch 'bug19071-extra-squashed' into maint-0.2.8

 changes/ticket19071-19480   |  3 ++
 scripts/maint/fallback.whitelist|  4 +--
 scripts/maint/updateFallbackDirs.py |  9 +++--
 src/or/fallback_dirs.inc| 67 +++--
 4 files changed, 47 insertions(+), 36 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.8] Comment-out fallbacks in a way the stem fallback parser understands

2016-06-28 Thread nickm 
commit 26146dbe9eb2404274b7c51121710f3f3529c930
Author: teor (Tim Wilson-Brown) 
Date:   Thu Jun 23 10:49:03 2016 +1000

Comment-out fallbacks in a way the stem fallback parser understands

If we manually remove fallbacks in C by adding '/*' and '*/' on separate
lines, stem still parses them as being present, because it only looks at
the start of a line.

Add a comment to this effect in the generated source code.
---
 changes/ticket19071-19480   |  3 ++
 scripts/maint/updateFallbackDirs.py |  9 +++--
 src/or/fallback_dirs.inc| 67 +++--
 3 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/changes/ticket19071-19480 b/changes/ticket19071-19480
index 3366f82..ab5c72a 100644
--- a/changes/ticket19071-19480
+++ b/changes/ticket19071-19480
@@ -5,6 +5,9 @@
   o Minor features (fallback directory list):
 - Update hard-coded fallback list to remove unsuitable fallbacks.
   Resolves ticket 19071. Patch by teor.
+- Add a comment to the generated list that explains how to comment-out
+  unsuitable fallbacks in a way that's compatible with the stem fallback
+  parser.
 - Update fallback whitelist and blacklist based on relay operator
   emails. Blacklist unsuitable fallbacks. Resolves ticket 19071.
   Patch by teor.
diff --git a/scripts/maint/updateFallbackDirs.py 
b/scripts/maint/updateFallbackDirs.py
index d17e702..110ecda 100755
--- a/scripts/maint/updateFallbackDirs.py
+++ b/scripts/maint/updateFallbackDirs.py
@@ -1828,20 +1828,25 @@ 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)
 #  min & max fallback bandwidths
 #  #error if below minimum count
 if PERFORM_IPV4_DIRPORT_CHECKS or PERFORM_IPV6_DIRPORT_CHECKS:
-  s = '/* Checked %s%s%s DirPorts served a consensus within %.1fs. */'%(
+  s += '/* Checked %s%s%s DirPorts served a consensus within %.1fs. */'%(
 'IPv4' if PERFORM_IPV4_DIRPORT_CHECKS else '',
 ' and ' if (PERFORM_IPV4_DIRPORT_CHECKS
 and PERFORM_IPV6_DIRPORT_CHECKS) else '',
 'IPv6' if PERFORM_IPV6_DIRPORT_CHECKS else '',
 CONSENSUS_DOWNLOAD_SPEED_MAX)
 else:
-  s = '/* Did not check IPv4 or IPv6 DirPort consensus downloads. */'
+  s += '/* Did not check IPv4 or IPv6 DirPort consensus downloads. */'
 s += '\n'
 # Multiline C comment with #error if things go bad
 s += '/*'
diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc
index e422940..e4959f2 100644
--- a/src/or/fallback_dirs.inc
+++ b/src/or/fallback_dirs.inc
@@ -1,3 +1,4 @@
+/* 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.) */
 /* Whitelist & blacklist excluded 1273 of 1553 candidates. */
 /* Checked IPv4 DirPorts served a consensus within 15.0s. */
 /*
@@ -41,9 +42,9 @@ URL: 
https:onionoo.torproject.orguptime?first_seen_days=7-=V2Dir=relay
 "185.61.138.18:8080 orport=4443 id=2541759BEC04D37811C2209A88E863320271EC9C"
 " weight=10",
 /* Fallback was on 0.2.8.2-alpha list, but went down before 0.2.8.5
-"51.254.215.121:80 orport=443 id=262B66AD25C79588AD1FC8ED0E966395B47E5C1D"
-" weight=10",
-*/
+ * "51.254.215.121:80 orport=443 id=262B66AD25C79588AD1FC8ED0E966395B47E5C1D"
+ * " weight=10",
+ */
 "194.150.168.79:2 orport=1 id=29F1020B94BE25E6BE1AD13E93CE19D2131B487C"
 " weight=10",
 "144.76.26.175:9012 orport=9011 id=2BA2C8E96B2590E1072AECE2BDB5C48921BF8510"
@@ -93,9 +94,9 @@ URL: 
https:onionoo.torproject.orguptime?first_seen_days=7-=V2Dir=relay
 "78.142.142.246:80 orport=443 id=5A5E03355C1908EBF424CAF1F3ED70782C0D2F74"
 " weight=10",
 /* Fallback was on 0.2.8.2-alpha list, but went down before 0.2.8.5
-"185.100.85.138:80 orport=46356 id=5C4DF16A0029CC4F67D3E127356E68F219269859"
-" weight=10",
-*/
+ * "185.100.85.138:80 orport=46356 id=5C4DF16A0029CC4F67D3E127356E68F219269859"
+ * " weight=10",
+ */
 "178.16.208.62:80 orport=443 id=5CF8AFA5E4B0BB88942A44A3F3AAE08C3BDFD60B"
 " ipv6=[2a00:1c20:4089:1234:a6a4:2926:d0af:dfee]:443"
 " weight=10",
@@ -125,21 +126,21 @@ URL: 
https:onionoo.torproject.orguptime?first_seen_days=7-=V2Dir=relay
 "192.87.28.82:9030 orport=9001 id=844AE9CAD04325E955E2BE1521563B79FE7094B7"
 " weight=10",
 /* 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"
-" weight=10",
-*/
+

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

2016-06-28 Thread nickm 
commit 34879d0a4b47815af413d169fbbde0162068bb00
Merge: 87ea2b6 2c9354f
Author: Nick Mathewson 
Date:   Tue Jun 28 19:15:32 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/ticket19071-19480   |  3 ++
 scripts/maint/fallback.whitelist|  4 +--
 scripts/maint/updateFallbackDirs.py |  9 +++--
 src/or/fallback_dirs.inc| 67 +++--
 4 files changed, 47 insertions(+), 36 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.2.8] Whitelist a fallback's new IPv6 address

2016-06-28 Thread nickm 
commit dae442a38272f26a2c0580a6ec03fec392c4ac9d
Author: teor (Tim Wilson-Brown) 
Date:   Thu Jun 23 10:38:52 2016 +1000

Whitelist a fallback's new IPv6 address

The IPv4-only entry will be used for 0.2.8.
The IPv4 and IPv6 entry will be considered in 0.2.9.
---
 scripts/maint/fallback.whitelist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist
index 574caed..fb432ca 100644
--- a/scripts/maint/fallback.whitelist
+++ b/scripts/maint/fallback.whitelist
@@ -658,7 +658,7 @@
 # Email sent directly to teor, verified using relay contact info
 96.47.231.214:9030 orport=8080 id=F843CB5729575D76FF1FFBB2179BDCF52C0C6387
 192.99.246.48:9030 orport=9001 id=CD6B149BED1BB254EF6DFF9D75DDB11E7F8A38A4 
ipv6=[2607:5300:100:200::de3]:9002
-192.160.102.164:80 orport=9001 id=823AA81E277F366505545522CEDC2F529CE4DC3F
+192.160.102.164:80 orport=9001 id=823AA81E277F366505545522CEDC2F529CE4DC3F 
ipv6=[2605:e200:d00c:c01d::]:9002
 
 # Email sent directly to teor, verified using relay contact info
 136.243.214.137:80 orport=443 id=B291D30517D23299AD7CEE3E60DFE60D0E3A4664



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

[tor-commits] [tor/master] Remove a fallback that changed DirPort

2016-06-28 Thread nickm 
commit 828e2e1a2e1d438d2629000a85e535dc23891529
Author: teor (Tim Wilson-Brown) 
Date:   Thu Jun 23 10:38:03 2016 +1000

Remove a fallback that changed DirPort

The operator has confirmed that the DirPort change is perament.
The relay will be reconsidered as a fallback in 0.2.9.
---
 scripts/maint/fallback.whitelist | 2 +-
 src/or/fallback_dirs.inc | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist
index 30db949..574caed 100644
--- a/scripts/maint/fallback.whitelist
+++ b/scripts/maint/fallback.whitelist
@@ -638,7 +638,7 @@
 91.121.54.8:9030 orport=9001 id=CBEE0F3303C8C50462A12107CA2AE061831931BC
 
 # Email sent directly to teor, verified using relay contact info
-178.217.184.32:9030 orport=443 id=8B7F47AE1A5D954A3E58ACDE0865D09DBA5B738D
+178.217.184.32:8080 orport=443 id=8B7F47AE1A5D954A3E58ACDE0865D09DBA5B738D
 
 # Email sent directly to teor, verified using relay contact info
 85.10.201.47:9030 orport=9001 id=D8B7A3A6542AA54D0946B9DC0257C53B6C376679 
ipv6=[2a01:4f8:a0:43eb::beef]:9001
diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc
index 58c67c0..e422940 100644
--- a/src/or/fallback_dirs.inc
+++ b/src/or/fallback_dirs.inc
@@ -136,8 +136,10 @@ URL: 
https:onionoo.torproject.orguptime?first_seen_days=7-=V2Dir=relay
 */
 "93.180.156.84:9030 orport=9001 id=8844D87E9B038BE3270938F05AF797E1D3C74C0F"
 " weight=10",
+/* Fallback was on 0.2.8.2-alpha list, but DirPort changed before 0.2.8.5
 "178.217.184.32:9030 orport=443 id=8B7F47AE1A5D954A3E58ACDE0865D09DBA5B738D"
 " weight=10",
+*/
 "151.80.42.103:9030 orport=9001 id=9007C1D8E4F03D506A4A011B907A9E8D04E3C605"
 " ipv6=[2001:41d0:e:f67::114]:9001"
 " weight=10",



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

[tor-commits] [tor/master] Comment-out fallbacks in a way the stem fallback parser understands

2016-06-28 Thread nickm 
commit 26146dbe9eb2404274b7c51121710f3f3529c930
Author: teor (Tim Wilson-Brown) 
Date:   Thu Jun 23 10:49:03 2016 +1000

Comment-out fallbacks in a way the stem fallback parser understands

If we manually remove fallbacks in C by adding '/*' and '*/' on separate
lines, stem still parses them as being present, because it only looks at
the start of a line.

Add a comment to this effect in the generated source code.
---
 changes/ticket19071-19480   |  3 ++
 scripts/maint/updateFallbackDirs.py |  9 +++--
 src/or/fallback_dirs.inc| 67 +++--
 3 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/changes/ticket19071-19480 b/changes/ticket19071-19480
index 3366f82..ab5c72a 100644
--- a/changes/ticket19071-19480
+++ b/changes/ticket19071-19480
@@ -5,6 +5,9 @@
   o Minor features (fallback directory list):
 - Update hard-coded fallback list to remove unsuitable fallbacks.
   Resolves ticket 19071. Patch by teor.
+- Add a comment to the generated list that explains how to comment-out
+  unsuitable fallbacks in a way that's compatible with the stem fallback
+  parser.
 - Update fallback whitelist and blacklist based on relay operator
   emails. Blacklist unsuitable fallbacks. Resolves ticket 19071.
   Patch by teor.
diff --git a/scripts/maint/updateFallbackDirs.py 
b/scripts/maint/updateFallbackDirs.py
index d17e702..110ecda 100755
--- a/scripts/maint/updateFallbackDirs.py
+++ b/scripts/maint/updateFallbackDirs.py
@@ -1828,20 +1828,25 @@ 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)
 #  min & max fallback bandwidths
 #  #error if below minimum count
 if PERFORM_IPV4_DIRPORT_CHECKS or PERFORM_IPV6_DIRPORT_CHECKS:
-  s = '/* Checked %s%s%s DirPorts served a consensus within %.1fs. */'%(
+  s += '/* Checked %s%s%s DirPorts served a consensus within %.1fs. */'%(
 'IPv4' if PERFORM_IPV4_DIRPORT_CHECKS else '',
 ' and ' if (PERFORM_IPV4_DIRPORT_CHECKS
 and PERFORM_IPV6_DIRPORT_CHECKS) else '',
 'IPv6' if PERFORM_IPV6_DIRPORT_CHECKS else '',
 CONSENSUS_DOWNLOAD_SPEED_MAX)
 else:
-  s = '/* Did not check IPv4 or IPv6 DirPort consensus downloads. */'
+  s += '/* Did not check IPv4 or IPv6 DirPort consensus downloads. */'
 s += '\n'
 # Multiline C comment with #error if things go bad
 s += '/*'
diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc
index e422940..e4959f2 100644
--- a/src/or/fallback_dirs.inc
+++ b/src/or/fallback_dirs.inc
@@ -1,3 +1,4 @@
+/* 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.) */
 /* Whitelist & blacklist excluded 1273 of 1553 candidates. */
 /* Checked IPv4 DirPorts served a consensus within 15.0s. */
 /*
@@ -41,9 +42,9 @@ URL: 
https:onionoo.torproject.orguptime?first_seen_days=7-=V2Dir=relay
 "185.61.138.18:8080 orport=4443 id=2541759BEC04D37811C2209A88E863320271EC9C"
 " weight=10",
 /* Fallback was on 0.2.8.2-alpha list, but went down before 0.2.8.5
-"51.254.215.121:80 orport=443 id=262B66AD25C79588AD1FC8ED0E966395B47E5C1D"
-" weight=10",
-*/
+ * "51.254.215.121:80 orport=443 id=262B66AD25C79588AD1FC8ED0E966395B47E5C1D"
+ * " weight=10",
+ */
 "194.150.168.79:2 orport=1 id=29F1020B94BE25E6BE1AD13E93CE19D2131B487C"
 " weight=10",
 "144.76.26.175:9012 orport=9011 id=2BA2C8E96B2590E1072AECE2BDB5C48921BF8510"
@@ -93,9 +94,9 @@ URL: 
https:onionoo.torproject.orguptime?first_seen_days=7-=V2Dir=relay
 "78.142.142.246:80 orport=443 id=5A5E03355C1908EBF424CAF1F3ED70782C0D2F74"
 " weight=10",
 /* Fallback was on 0.2.8.2-alpha list, but went down before 0.2.8.5
-"185.100.85.138:80 orport=46356 id=5C4DF16A0029CC4F67D3E127356E68F219269859"
-" weight=10",
-*/
+ * "185.100.85.138:80 orport=46356 id=5C4DF16A0029CC4F67D3E127356E68F219269859"
+ * " weight=10",
+ */
 "178.16.208.62:80 orport=443 id=5CF8AFA5E4B0BB88942A44A3F3AAE08C3BDFD60B"
 " ipv6=[2a00:1c20:4089:1234:a6a4:2926:d0af:dfee]:443"
 " weight=10",
@@ -125,21 +126,21 @@ URL: 
https:onionoo.torproject.orguptime?first_seen_days=7-=V2Dir=relay
 "192.87.28.82:9030 orport=9001 id=844AE9CAD04325E955E2BE1521563B79FE7094B7"
 " weight=10",
 /* 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"
-" weight=10",
-*/
+

[tor-commits] [tor/master] Whitelist a fallback's new IPv6 address

2016-06-28 Thread nickm 
commit dae442a38272f26a2c0580a6ec03fec392c4ac9d
Author: teor (Tim Wilson-Brown) 
Date:   Thu Jun 23 10:38:52 2016 +1000

Whitelist a fallback's new IPv6 address

The IPv4-only entry will be used for 0.2.8.
The IPv4 and IPv6 entry will be considered in 0.2.9.
---
 scripts/maint/fallback.whitelist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist
index 574caed..fb432ca 100644
--- a/scripts/maint/fallback.whitelist
+++ b/scripts/maint/fallback.whitelist
@@ -658,7 +658,7 @@
 # Email sent directly to teor, verified using relay contact info
 96.47.231.214:9030 orport=8080 id=F843CB5729575D76FF1FFBB2179BDCF52C0C6387
 192.99.246.48:9030 orport=9001 id=CD6B149BED1BB254EF6DFF9D75DDB11E7F8A38A4 
ipv6=[2607:5300:100:200::de3]:9002
-192.160.102.164:80 orport=9001 id=823AA81E277F366505545522CEDC2F529CE4DC3F
+192.160.102.164:80 orport=9001 id=823AA81E277F366505545522CEDC2F529CE4DC3F 
ipv6=[2605:e200:d00c:c01d::]:9002
 
 # Email sent directly to teor, verified using relay contact info
 136.243.214.137:80 orport=443 id=B291D30517D23299AD7CEE3E60DFE60D0E3A4664



___
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.8] Whitelist a fallback's new IPv6 address

2016-06-28 Thread nickm 
commit dae442a38272f26a2c0580a6ec03fec392c4ac9d
Author: teor (Tim Wilson-Brown) 
Date:   Thu Jun 23 10:38:52 2016 +1000

Whitelist a fallback's new IPv6 address

The IPv4-only entry will be used for 0.2.8.
The IPv4 and IPv6 entry will be considered in 0.2.9.
---
 scripts/maint/fallback.whitelist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist
index 574caed..fb432ca 100644
--- a/scripts/maint/fallback.whitelist
+++ b/scripts/maint/fallback.whitelist
@@ -658,7 +658,7 @@
 # Email sent directly to teor, verified using relay contact info
 96.47.231.214:9030 orport=8080 id=F843CB5729575D76FF1FFBB2179BDCF52C0C6387
 192.99.246.48:9030 orport=9001 id=CD6B149BED1BB254EF6DFF9D75DDB11E7F8A38A4 
ipv6=[2607:5300:100:200::de3]:9002
-192.160.102.164:80 orport=9001 id=823AA81E277F366505545522CEDC2F529CE4DC3F
+192.160.102.164:80 orport=9001 id=823AA81E277F366505545522CEDC2F529CE4DC3F 
ipv6=[2605:e200:d00c:c01d::]:9002
 
 # Email sent directly to teor, verified using relay contact info
 136.243.214.137:80 orport=443 id=B291D30517D23299AD7CEE3E60DFE60D0E3A4664



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

2016-06-28 Thread nickm 
commit f42dbc4e263d3c5f9021d062c5ea0d3cfa29d47b
Merge: d793a98 2c9354f
Author: Nick Mathewson 
Date:   Tue Jun 28 19:15:43 2016 -0400

Merge branch 'maint-0.2.8'

 changes/ticket19071-19480   |  3 ++
 scripts/maint/fallback.whitelist|  4 +--
 scripts/maint/updateFallbackDirs.py |  9 +++--
 src/or/fallback_dirs.inc| 67 +++--
 4 files changed, 47 insertions(+), 36 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.8] Remove a fallback that changed DirPort

2016-06-28 Thread nickm 
commit 828e2e1a2e1d438d2629000a85e535dc23891529
Author: teor (Tim Wilson-Brown) 
Date:   Thu Jun 23 10:38:03 2016 +1000

Remove a fallback that changed DirPort

The operator has confirmed that the DirPort change is perament.
The relay will be reconsidered as a fallback in 0.2.9.
---
 scripts/maint/fallback.whitelist | 2 +-
 src/or/fallback_dirs.inc | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist
index 30db949..574caed 100644
--- a/scripts/maint/fallback.whitelist
+++ b/scripts/maint/fallback.whitelist
@@ -638,7 +638,7 @@
 91.121.54.8:9030 orport=9001 id=CBEE0F3303C8C50462A12107CA2AE061831931BC
 
 # Email sent directly to teor, verified using relay contact info
-178.217.184.32:9030 orport=443 id=8B7F47AE1A5D954A3E58ACDE0865D09DBA5B738D
+178.217.184.32:8080 orport=443 id=8B7F47AE1A5D954A3E58ACDE0865D09DBA5B738D
 
 # Email sent directly to teor, verified using relay contact info
 85.10.201.47:9030 orport=9001 id=D8B7A3A6542AA54D0946B9DC0257C53B6C376679 
ipv6=[2a01:4f8:a0:43eb::beef]:9001
diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc
index 58c67c0..e422940 100644
--- a/src/or/fallback_dirs.inc
+++ b/src/or/fallback_dirs.inc
@@ -136,8 +136,10 @@ URL: 
https:onionoo.torproject.orguptime?first_seen_days=7-=V2Dir=relay
 */
 "93.180.156.84:9030 orport=9001 id=8844D87E9B038BE3270938F05AF797E1D3C74C0F"
 " weight=10",
+/* Fallback was on 0.2.8.2-alpha list, but DirPort changed before 0.2.8.5
 "178.217.184.32:9030 orport=443 id=8B7F47AE1A5D954A3E58ACDE0865D09DBA5B738D"
 " weight=10",
+*/
 "151.80.42.103:9030 orport=9001 id=9007C1D8E4F03D506A4A011B907A9E8D04E3C605"
 " ipv6=[2001:41d0:e:f67::114]:9001"
 " weight=10",



___
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.8] Remove a fallback that changed DirPort

2016-06-28 Thread nickm 
commit 828e2e1a2e1d438d2629000a85e535dc23891529
Author: teor (Tim Wilson-Brown) 
Date:   Thu Jun 23 10:38:03 2016 +1000

Remove a fallback that changed DirPort

The operator has confirmed that the DirPort change is perament.
The relay will be reconsidered as a fallback in 0.2.9.
---
 scripts/maint/fallback.whitelist | 2 +-
 src/or/fallback_dirs.inc | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist
index 30db949..574caed 100644
--- a/scripts/maint/fallback.whitelist
+++ b/scripts/maint/fallback.whitelist
@@ -638,7 +638,7 @@
 91.121.54.8:9030 orport=9001 id=CBEE0F3303C8C50462A12107CA2AE061831931BC
 
 # Email sent directly to teor, verified using relay contact info
-178.217.184.32:9030 orport=443 id=8B7F47AE1A5D954A3E58ACDE0865D09DBA5B738D
+178.217.184.32:8080 orport=443 id=8B7F47AE1A5D954A3E58ACDE0865D09DBA5B738D
 
 # Email sent directly to teor, verified using relay contact info
 85.10.201.47:9030 orport=9001 id=D8B7A3A6542AA54D0946B9DC0257C53B6C376679 
ipv6=[2a01:4f8:a0:43eb::beef]:9001
diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc
index 58c67c0..e422940 100644
--- a/src/or/fallback_dirs.inc
+++ b/src/or/fallback_dirs.inc
@@ -136,8 +136,10 @@ URL: 
https:onionoo.torproject.orguptime?first_seen_days=7-=V2Dir=relay
 */
 "93.180.156.84:9030 orport=9001 id=8844D87E9B038BE3270938F05AF797E1D3C74C0F"
 " weight=10",
+/* Fallback was on 0.2.8.2-alpha list, but DirPort changed before 0.2.8.5
 "178.217.184.32:9030 orport=443 id=8B7F47AE1A5D954A3E58ACDE0865D09DBA5B738D"
 " weight=10",
+*/
 "151.80.42.103:9030 orport=9001 id=9007C1D8E4F03D506A4A011B907A9E8D04E3C605"
 " ipv6=[2001:41d0:e:f67::114]:9001"
 " weight=10",



___
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.8] Refactor connection_or_client_learned_peer_id for bug18812

2016-06-28 Thread nickm 
commit 14b1c7a66e6d186a40da99da773a692ef48b603c
Author: teor (Tim Wilson-Brown) 
Date:   Tue Jun 28 14:12:18 2016 +1000

Refactor connection_or_client_learned_peer_id for bug18812

No behavioural change.
Also clarify some comments.
---
 src/or/connection_or.c | 19 ---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index ea49bdb..19a1718 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1698,9 +1698,14 @@ connection_or_check_valid_tls_handshake(or_connection_t 
*conn,
  * or renegotiation.  For v3 handshakes, this is right after we get a
  * certificate chain in a CERTS cell.
  *
- * If we want any particular ID before, record the one we got.
+ * If we did not know the ID before, record the one we got.
  *
- * If we wanted an ID, but we didn't get it, log a warning and return -1.
+ * If we wanted an ID, but we didn't get the one we expected, log a message
+ * and return -1.
+ * On relays:
+ *  - log a protocol warning whenever the fingerprints don't match;
+ * On clients:
+ *  - if a relay's fingerprint doesn't match, log a warning;
  *
  * If we're testing reachability, remember what we learned.
  *
@@ -1711,7 +1716,6 @@ connection_or_client_learned_peer_id(or_connection_t 
*conn,
  const uint8_t *peer_id)
 {
   const or_options_t *options = get_options();
-  int severity = server_mode(options) ? LOG_PROTOCOL_WARN : LOG_WARN;
 
   if (tor_digest_is_zero(conn->identity_digest)) {
 connection_or_set_identity_digest(conn, (const char*)peer_id);
@@ -1736,6 +1740,15 @@ connection_or_client_learned_peer_id(or_connection_t 
*conn,
 base16_encode(seen, sizeof(seen), (const char*)peer_id, DIGEST_LEN);
 base16_encode(expected, sizeof(expected), conn->identity_digest,
   DIGEST_LEN);
+int severity;
+
+if (server_mode(options)) {
+  severity = LOG_PROTOCOL_WARN;
+} else {
+  /* a relay has changed its fingerprint from the one in the consensus */
+  severity = LOG_WARN;
+}
+
 log_fn(severity, LD_HANDSHAKE,
"Tried connecting to router at %s:%d, but identity key was not "
"as expected: wanted %s but got %s.",



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

2016-06-28 Thread nickm 
commit d793a988cd9f3dca6b388857102ce7aabf7bbb9d
Merge: 4e2a7cd bc9a0f8
Author: Nick Mathewson 
Date:   Tue Jun 28 11:22:48 2016 -0400

Merge branch 'maint-0.2.8'

 changes/bug18812   |  4 
 src/or/connection_or.c | 51 +-
 src/or/routerlist.c|  2 ++
 3 files changed, 52 insertions(+), 5 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.8] Merge remote-tracking branch 'teor/bug18812' into maint-0.2.8

2016-06-28 Thread nickm 
commit f87aa4555d06b2707e21df39d1bc7f14161a2cb4
Merge: 0116eae 608c12b
Author: Nick Mathewson 
Date:   Tue Jun 28 11:12:51 2016 -0400

Merge remote-tracking branch 'teor/bug18812' into maint-0.2.8

 changes/bug18812   |  4 
 src/or/connection_or.c | 51 +-
 src/or/routerlist.c|  2 ++
 3 files changed, 52 insertions(+), 5 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.8] whitespace fixes

2016-06-28 Thread nickm 
commit bc9a0f82b3436dad2aa09c1b68c0c230751d48dd
Author: Nick Mathewson 
Date:   Tue Jun 28 11:14:42 2016 -0400

whitespace fixes
---
 src/or/connection_or.c | 2 +-
 src/or/routerlist.c| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 5c4461f..9730e1a 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1750,7 +1750,7 @@ connection_or_client_learned_peer_id(or_connection_t 
*conn,
 const int is_fallback_fingerprint = router_digest_is_fallback_dir(
conn->identity_digest);
 const int is_authority_fingerprint = router_digest_is_trusted_dir(
-  
conn->identity_digest);
+   conn->identity_digest);
 int severity;
 const char *extra_log = "";
 
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 432c64d..49d7680 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1408,7 +1408,7 @@ router_get_fallback_dirserver_by_digest(const char 
*digest)
  * or 0 if no such fallback is in the list of fallback_dir_servers.
  * (fallback_dir_servers is affected by the FallbackDir and
  * UseDefaultFallbackDirs torrc options.)
- * The list of fallback directories includes the list of authorities.
+ * The list of fallback directories includes the list of authorities.
  */
 int
 router_digest_is_fallback_dir(const char *digest)



___
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.8] Bug19499: Fix GCC warnings when building against bleeding edge OpenSSL.

2016-06-28 Thread nickm 
commit 0116eae59a35e4303ca179d6b0fb0302a83e87a1
Author: Yawning Angel 
Date:   Fri Jun 24 22:20:41 2016 +

Bug19499: Fix GCC warnings when building against bleeding edge OpenSSL.

The previous version of the new accessors didn't specify const but it
was changed in master.
---
 changes/bug19499 |  4 
 src/common/crypto.c  | 24 
 src/tools/tor-checkkey.c |  4 ++--
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/changes/bug19499 b/changes/bug19499
new file mode 100644
index 000..5db49bb
--- /dev/null
+++ b/changes/bug19499
@@ -0,0 +1,4 @@
+  o Minor features (build):
+- Tor now again builds with the recent OpenSSL 1.1 development branch
+  (tested against 1.1.0-pre6-dev).
+
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 8d990d3..2b96324 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -145,7 +145,7 @@ struct crypto_dh_t {
 };
 
 static int setup_openssl_threading(void);
-static int tor_check_dh_key(int severity, BIGNUM *bn);
+static int tor_check_dh_key(int severity, const BIGNUM *bn);
 
 /** Return the number of bytes added by padding method padding.
  */
@@ -466,7 +466,7 @@ crypto_pk_private_ok(const crypto_pk_t *k)
   if (!k || !k->key)
 return 0;
 
-  BIGNUM *p, *q;
+  const BIGNUM *p, *q;
   RSA_get0_factors(k->key, , );
   return p != NULL; /* XXX/yawning: Should we check q? */
 #else
@@ -890,10 +890,10 @@ crypto_pk_public_exponent_ok(crypto_pk_t *env)
   tor_assert(env);
   tor_assert(env->key);
 
-  BIGNUM *e;
+  const BIGNUM *e;
 
 #ifdef OPENSSL_1_1_API
-  BIGNUM *n, *d;
+  const BIGNUM *n, *d;
   RSA_get0_key(env->key, , , );
 #else
   e = env->key->e;
@@ -919,11 +919,11 @@ crypto_pk_cmp_keys(const crypto_pk_t *a, const 
crypto_pk_t *b)
   if (an_argument_is_null)
 return result;
 
-  BIGNUM *a_n, *a_e;
-  BIGNUM *b_n, *b_e;
+  const BIGNUM *a_n, *a_e;
+  const BIGNUM *b_n, *b_e;
 
 #ifdef OPENSSL_1_1_API
-  BIGNUM *a_d, *b_d;
+  const BIGNUM *a_d, *b_d;
   RSA_get0_key(a->key, _n, _e, _d);
   RSA_get0_key(b->key, _n, _e, _d);
 #else
@@ -975,7 +975,7 @@ crypto_pk_num_bits(crypto_pk_t *env)
   /* It's so stupid that there's no other way to check that n is valid
* before calling RSA_bits().
*/
-  BIGNUM *n, *e, *d;
+  const BIGNUM *n, *e, *d;
   RSA_get0_key(env->key, , , );
   tor_assert(n != NULL);
 
@@ -2420,7 +2420,7 @@ crypto_dh_generate_public(crypto_dh_t *dh)
* recreating the DH object.  I have no idea what sort of aliasing madness
* can occur here, so do the check, and just bail on failure.
*/
-  BIGNUM *pub_key, *priv_key;
+  const BIGNUM *pub_key, *priv_key;
   DH_get0_key(dh->dh, _key, _key);
   if (tor_check_dh_key(LOG_WARN, pub_key)<0) {
 log_warn(LD_CRYPTO, "Weird! Our own DH key was invalid.  I guess once-in-"
@@ -2451,10 +2451,10 @@ crypto_dh_get_public(crypto_dh_t *dh, char *pubkey, 
size_t pubkey_len)
   int bytes;
   tor_assert(dh);
 
-  BIGNUM *dh_pub;
+  const BIGNUM *dh_pub;
 
 #ifdef OPENSSL_1_1_API
-  BIGNUM *dh_priv;
+  const BIGNUM *dh_priv;
   DH_get0_key(dh->dh, _pub, _priv);
 #else
   dh_pub = dh->dh->pub_key;
@@ -2493,7 +2493,7 @@ crypto_dh_get_public(crypto_dh_t *dh, char *pubkey, 
size_t pubkey_len)
  * See http://www.cl.cam.ac.uk/ftp/users/rja14/psandqs.ps.gz for some tips.
  */
 static int
-tor_check_dh_key(int severity, BIGNUM *bn)
+tor_check_dh_key(int severity, const BIGNUM *bn)
 {
   BIGNUM *x;
   char *s;
diff --git a/src/tools/tor-checkkey.c b/src/tools/tor-checkkey.c
index 8e957c2..3e16fd0 100644
--- a/src/tools/tor-checkkey.c
+++ b/src/tools/tor-checkkey.c
@@ -72,9 +72,9 @@ main(int c, char **v)
   } else {
 rsa = crypto_pk_get_rsa_(env);
 
-BIGNUM *rsa_n;
+const BIGNUM *rsa_n;
 #ifdef OPENSSL_1_1_API
-BIGNUM *rsa_e, *rsa_d;
+const BIGNUM *rsa_e, *rsa_d;
 RSA_get0_key(rsa, _n, _e, _d);
 #else
 rsa_n = rsa->n;



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

2016-06-28 Thread nickm 
commit 5b57f88f6097e92a052cd8d381587cee1dea6006
Merge: cc6fcbd 0116eae
Author: Nick Mathewson 
Date:   Mon Jun 27 13:20:57 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug19499 |  4 
 src/common/crypto.c  | 24 
 src/tools/tor-checkkey.c |  4 ++--
 3 files changed, 18 insertions(+), 14 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.8] Merge branch 'maint-0.2.8' into release-0.2.8

2016-06-28 Thread nickm 
commit 87ea2b6655d43ab95becf681e26a2092db17161e
Merge: 5b57f88 bc9a0f8
Author: Nick Mathewson 
Date:   Tue Jun 28 11:22:39 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug18812   |  4 
 src/or/connection_or.c | 51 +-
 src/or/routerlist.c|  2 ++
 3 files changed, 52 insertions(+), 5 deletions(-)

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

[tor-commits] [tor/master] Make it clear that fallbacks include authorities

2016-06-28 Thread nickm 
commit 812fd416eff4fa7326cbd4bd46ff0f5801b9034c
Author: teor (Tim Wilson-Brown) 
Date:   Tue Jun 28 14:14:04 2016 +1000

Make it clear that fallbacks include authorities

Comment-only change
---
 src/or/routerlist.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index d49814f..d7faf78 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1384,6 +1384,7 @@ router_get_trusteddirserver_by_digest(const char *digest)
  * key hashes to digest, or NULL if no such fallback is in the list of
  * fallback_dir_servers. (fallback_dir_servers is affected by the FallbackDir
  * and UseDefaultFallbackDirs torrc options.)
+ * The list of fallback directories includes the list of authorities.
  */
 dir_server_t *
 router_get_fallback_dirserver_by_digest(const char *digest)
@@ -1407,6 +1408,7 @@ router_get_fallback_dirserver_by_digest(const char 
*digest)
  * or 0 if no such fallback is in the list of fallback_dir_servers.
  * (fallback_dir_servers is affected by the FallbackDir and
  * UseDefaultFallbackDirs torrc options.)
+ * The list of fallback directories includes the list of authorities.
  */
 int
 router_digest_is_fallback_dir(const char *digest)



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

[tor-commits] [tor/master] Refactor connection_or_client_learned_peer_id for bug18812

2016-06-28 Thread nickm 
commit 14b1c7a66e6d186a40da99da773a692ef48b603c
Author: teor (Tim Wilson-Brown) 
Date:   Tue Jun 28 14:12:18 2016 +1000

Refactor connection_or_client_learned_peer_id for bug18812

No behavioural change.
Also clarify some comments.
---
 src/or/connection_or.c | 19 ---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index ea49bdb..19a1718 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1698,9 +1698,14 @@ connection_or_check_valid_tls_handshake(or_connection_t 
*conn,
  * or renegotiation.  For v3 handshakes, this is right after we get a
  * certificate chain in a CERTS cell.
  *
- * If we want any particular ID before, record the one we got.
+ * If we did not know the ID before, record the one we got.
  *
- * If we wanted an ID, but we didn't get it, log a warning and return -1.
+ * If we wanted an ID, but we didn't get the one we expected, log a message
+ * and return -1.
+ * On relays:
+ *  - log a protocol warning whenever the fingerprints don't match;
+ * On clients:
+ *  - if a relay's fingerprint doesn't match, log a warning;
  *
  * If we're testing reachability, remember what we learned.
  *
@@ -1711,7 +1716,6 @@ connection_or_client_learned_peer_id(or_connection_t 
*conn,
  const uint8_t *peer_id)
 {
   const or_options_t *options = get_options();
-  int severity = server_mode(options) ? LOG_PROTOCOL_WARN : LOG_WARN;
 
   if (tor_digest_is_zero(conn->identity_digest)) {
 connection_or_set_identity_digest(conn, (const char*)peer_id);
@@ -1736,6 +1740,15 @@ connection_or_client_learned_peer_id(or_connection_t 
*conn,
 base16_encode(seen, sizeof(seen), (const char*)peer_id, DIGEST_LEN);
 base16_encode(expected, sizeof(expected), conn->identity_digest,
   DIGEST_LEN);
+int severity;
+
+if (server_mode(options)) {
+  severity = LOG_PROTOCOL_WARN;
+} else {
+  /* a relay has changed its fingerprint from the one in the consensus */
+  severity = LOG_WARN;
+}
+
 log_fn(severity, LD_HANDSHAKE,
"Tried connecting to router at %s:%d, but identity key was not "
"as expected: wanted %s but got %s.",



___
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.8] Make it clear that fallbacks include authorities

2016-06-28 Thread nickm 
commit 812fd416eff4fa7326cbd4bd46ff0f5801b9034c
Author: teor (Tim Wilson-Brown) 
Date:   Tue Jun 28 14:14:04 2016 +1000

Make it clear that fallbacks include authorities

Comment-only change
---
 src/or/routerlist.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index d49814f..d7faf78 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1384,6 +1384,7 @@ router_get_trusteddirserver_by_digest(const char *digest)
  * key hashes to digest, or NULL if no such fallback is in the list of
  * fallback_dir_servers. (fallback_dir_servers is affected by the FallbackDir
  * and UseDefaultFallbackDirs torrc options.)
+ * The list of fallback directories includes the list of authorities.
  */
 dir_server_t *
 router_get_fallback_dirserver_by_digest(const char *digest)
@@ -1407,6 +1408,7 @@ router_get_fallback_dirserver_by_digest(const char 
*digest)
  * or 0 if no such fallback is in the list of fallback_dir_servers.
  * (fallback_dir_servers is affected by the FallbackDir and
  * UseDefaultFallbackDirs torrc options.)
+ * The list of fallback directories includes the list of authorities.
  */
 int
 router_digest_is_fallback_dir(const char *digest)



___
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/bug18812' into maint-0.2.8

2016-06-28 Thread nickm 
commit f87aa4555d06b2707e21df39d1bc7f14161a2cb4
Merge: 0116eae 608c12b
Author: Nick Mathewson 
Date:   Tue Jun 28 11:12:51 2016 -0400

Merge remote-tracking branch 'teor/bug18812' into maint-0.2.8

 changes/bug18812   |  4 
 src/or/connection_or.c | 51 +-
 src/or/routerlist.c|  2 ++
 3 files changed, 52 insertions(+), 5 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.2.8] whitespace fixes

2016-06-28 Thread nickm 
commit bc9a0f82b3436dad2aa09c1b68c0c230751d48dd
Author: Nick Mathewson 
Date:   Tue Jun 28 11:14:42 2016 -0400

whitespace fixes
---
 src/or/connection_or.c | 2 +-
 src/or/routerlist.c| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 5c4461f..9730e1a 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1750,7 +1750,7 @@ connection_or_client_learned_peer_id(or_connection_t 
*conn,
 const int is_fallback_fingerprint = router_digest_is_fallback_dir(
conn->identity_digest);
 const int is_authority_fingerprint = router_digest_is_trusted_dir(
-  
conn->identity_digest);
+   conn->identity_digest);
 int severity;
 const char *extra_log = "";
 
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 432c64d..49d7680 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1408,7 +1408,7 @@ router_get_fallback_dirserver_by_digest(const char 
*digest)
  * or 0 if no such fallback is in the list of fallback_dir_servers.
  * (fallback_dir_servers is affected by the FallbackDir and
  * UseDefaultFallbackDirs torrc options.)
- * The list of fallback directories includes the list of authorities.
+ * The list of fallback directories includes the list of authorities.
  */
 int
 router_digest_is_fallback_dir(const char *digest)

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

[tor-commits] [tor/master] Resolve bug18812 by logging fallback key changes at info level

2016-06-28 Thread nickm 
commit 608c12baaf820c33246052e23fd0c65459ed1c5c
Author: teor (Tim Wilson-Brown) 
Date:   Tue Jun 28 14:15:11 2016 +1000

Resolve bug18812 by logging fallback key changes at info level
---
 changes/bug18812   |  4 
 src/or/connection_or.c | 36 
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/changes/bug18812 b/changes/bug18812
new file mode 100644
index 000..793e110
--- /dev/null
+++ b/changes/bug18812
@@ -0,0 +1,4 @@
+  o Minor bugfixes (bootstrap):
+- When a fallback changes its fingerprint from the hard-coded
+  fingerprint, log a less severe, more explanatory log message.
+  Fixes bug 18812; bugfix on 0.2.8.1-alpha. Patch by teor.
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 19a1718..5c4461f 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -31,6 +31,7 @@
 #include "geoip.h"
 #include "main.h"
 #include "link_handshake.h"
+#include "microdesc.h"
 #include "networkstatus.h"
 #include "nodelist.h"
 #include "reasons.h"
@@ -1706,6 +1707,9 @@ connection_or_check_valid_tls_handshake(or_connection_t 
*conn,
  *  - log a protocol warning whenever the fingerprints don't match;
  * On clients:
  *  - if a relay's fingerprint doesn't match, log a warning;
+ *  - if we don't have updated relay fingerprints from a recent consensus, and
+ *a fallback directory mirror's hard-coded fingerprint has changed, log an
+ *info explaining that we will try another fallback.
  *
  * If we're testing reachability, remember what we learned.
  *
@@ -1740,19 +1744,43 @@ connection_or_client_learned_peer_id(or_connection_t 
*conn,
 base16_encode(seen, sizeof(seen), (const char*)peer_id, DIGEST_LEN);
 base16_encode(expected, sizeof(expected), conn->identity_digest,
   DIGEST_LEN);
+const int using_hardcoded_fingerprints =
+  !networkstatus_get_reasonably_live_consensus(time(NULL),
+   usable_consensus_flavor());
+const int is_fallback_fingerprint = router_digest_is_fallback_dir(
+   conn->identity_digest);
+const int is_authority_fingerprint = router_digest_is_trusted_dir(
+  
conn->identity_digest);
 int severity;
+const char *extra_log = "";
 
 if (server_mode(options)) {
   severity = LOG_PROTOCOL_WARN;
 } else {
-  /* a relay has changed its fingerprint from the one in the consensus */
-  severity = LOG_WARN;
+  if (using_hardcoded_fingerprints) {
+/* We need to do the checks in this order, because the list of
+ * fallbacks includes the list of authorities */
+if (is_authority_fingerprint) {
+  severity = LOG_WARN;
+} else if (is_fallback_fingerprint) {
+  /* we expect a small number of fallbacks to change from their
+   * hard-coded fingerprints over the life of a release */
+  severity = LOG_INFO;
+  extra_log = " Tor will try a different fallback.";
+} else {
+  /* it's a bridge, it's either a misconfiguration, or unexpected */
+  severity = LOG_WARN;
+}
+  } else {
+/* a relay has changed its fingerprint from the one in the consensus */
+severity = LOG_WARN;
+  }
 }
 
 log_fn(severity, LD_HANDSHAKE,
"Tried connecting to router at %s:%d, but identity key was not "
-   "as expected: wanted %s but got %s.",
-   conn->base_.address, conn->base_.port, expected, seen);
+   "as expected: wanted %s but got %s.%s",
+   conn->base_.address, conn->base_.port, expected, seen, extra_log);
 entry_guard_register_connect_status(conn->identity_digest, 0, 1,
 time(NULL));
 control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED,



___
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.8] Refactor connection_or_client_learned_peer_id for bug18812

2016-06-28 Thread nickm 
commit 14b1c7a66e6d186a40da99da773a692ef48b603c
Author: teor (Tim Wilson-Brown) 
Date:   Tue Jun 28 14:12:18 2016 +1000

Refactor connection_or_client_learned_peer_id for bug18812

No behavioural change.
Also clarify some comments.
---
 src/or/connection_or.c | 19 ---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index ea49bdb..19a1718 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1698,9 +1698,14 @@ connection_or_check_valid_tls_handshake(or_connection_t 
*conn,
  * or renegotiation.  For v3 handshakes, this is right after we get a
  * certificate chain in a CERTS cell.
  *
- * If we want any particular ID before, record the one we got.
+ * If we did not know the ID before, record the one we got.
  *
- * If we wanted an ID, but we didn't get it, log a warning and return -1.
+ * If we wanted an ID, but we didn't get the one we expected, log a message
+ * and return -1.
+ * On relays:
+ *  - log a protocol warning whenever the fingerprints don't match;
+ * On clients:
+ *  - if a relay's fingerprint doesn't match, log a warning;
  *
  * If we're testing reachability, remember what we learned.
  *
@@ -1711,7 +1716,6 @@ connection_or_client_learned_peer_id(or_connection_t 
*conn,
  const uint8_t *peer_id)
 {
   const or_options_t *options = get_options();
-  int severity = server_mode(options) ? LOG_PROTOCOL_WARN : LOG_WARN;
 
   if (tor_digest_is_zero(conn->identity_digest)) {
 connection_or_set_identity_digest(conn, (const char*)peer_id);
@@ -1736,6 +1740,15 @@ connection_or_client_learned_peer_id(or_connection_t 
*conn,
 base16_encode(seen, sizeof(seen), (const char*)peer_id, DIGEST_LEN);
 base16_encode(expected, sizeof(expected), conn->identity_digest,
   DIGEST_LEN);
+int severity;
+
+if (server_mode(options)) {
+  severity = LOG_PROTOCOL_WARN;
+} else {
+  /* a relay has changed its fingerprint from the one in the consensus */
+  severity = LOG_WARN;
+}
+
 log_fn(severity, LD_HANDSHAKE,
"Tried connecting to router at %s:%d, but identity key was not "
"as expected: wanted %s but got %s.",



___
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.8] Resolve bug18812 by logging fallback key changes at info level

2016-06-28 Thread nickm 
commit 608c12baaf820c33246052e23fd0c65459ed1c5c
Author: teor (Tim Wilson-Brown) 
Date:   Tue Jun 28 14:15:11 2016 +1000

Resolve bug18812 by logging fallback key changes at info level
---
 changes/bug18812   |  4 
 src/or/connection_or.c | 36 
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/changes/bug18812 b/changes/bug18812
new file mode 100644
index 000..793e110
--- /dev/null
+++ b/changes/bug18812
@@ -0,0 +1,4 @@
+  o Minor bugfixes (bootstrap):
+- When a fallback changes its fingerprint from the hard-coded
+  fingerprint, log a less severe, more explanatory log message.
+  Fixes bug 18812; bugfix on 0.2.8.1-alpha. Patch by teor.
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 19a1718..5c4461f 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -31,6 +31,7 @@
 #include "geoip.h"
 #include "main.h"
 #include "link_handshake.h"
+#include "microdesc.h"
 #include "networkstatus.h"
 #include "nodelist.h"
 #include "reasons.h"
@@ -1706,6 +1707,9 @@ connection_or_check_valid_tls_handshake(or_connection_t 
*conn,
  *  - log a protocol warning whenever the fingerprints don't match;
  * On clients:
  *  - if a relay's fingerprint doesn't match, log a warning;
+ *  - if we don't have updated relay fingerprints from a recent consensus, and
+ *a fallback directory mirror's hard-coded fingerprint has changed, log an
+ *info explaining that we will try another fallback.
  *
  * If we're testing reachability, remember what we learned.
  *
@@ -1740,19 +1744,43 @@ connection_or_client_learned_peer_id(or_connection_t 
*conn,
 base16_encode(seen, sizeof(seen), (const char*)peer_id, DIGEST_LEN);
 base16_encode(expected, sizeof(expected), conn->identity_digest,
   DIGEST_LEN);
+const int using_hardcoded_fingerprints =
+  !networkstatus_get_reasonably_live_consensus(time(NULL),
+   usable_consensus_flavor());
+const int is_fallback_fingerprint = router_digest_is_fallback_dir(
+   conn->identity_digest);
+const int is_authority_fingerprint = router_digest_is_trusted_dir(
+  
conn->identity_digest);
 int severity;
+const char *extra_log = "";
 
 if (server_mode(options)) {
   severity = LOG_PROTOCOL_WARN;
 } else {
-  /* a relay has changed its fingerprint from the one in the consensus */
-  severity = LOG_WARN;
+  if (using_hardcoded_fingerprints) {
+/* We need to do the checks in this order, because the list of
+ * fallbacks includes the list of authorities */
+if (is_authority_fingerprint) {
+  severity = LOG_WARN;
+} else if (is_fallback_fingerprint) {
+  /* we expect a small number of fallbacks to change from their
+   * hard-coded fingerprints over the life of a release */
+  severity = LOG_INFO;
+  extra_log = " Tor will try a different fallback.";
+} else {
+  /* it's a bridge, it's either a misconfiguration, or unexpected */
+  severity = LOG_WARN;
+}
+  } else {
+/* a relay has changed its fingerprint from the one in the consensus */
+severity = LOG_WARN;
+  }
 }
 
 log_fn(severity, LD_HANDSHAKE,
"Tried connecting to router at %s:%d, but identity key was not "
-   "as expected: wanted %s but got %s.",
-   conn->base_.address, conn->base_.port, expected, seen);
+   "as expected: wanted %s but got %s.%s",
+   conn->base_.address, conn->base_.port, expected, seen, extra_log);
 entry_guard_register_connect_status(conn->identity_digest, 0, 1,
 time(NULL));
 control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED,



___
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.8] Resolve bug18812 by logging fallback key changes at info level

2016-06-28 Thread nickm 
commit 608c12baaf820c33246052e23fd0c65459ed1c5c
Author: teor (Tim Wilson-Brown) 
Date:   Tue Jun 28 14:15:11 2016 +1000

Resolve bug18812 by logging fallback key changes at info level
---
 changes/bug18812   |  4 
 src/or/connection_or.c | 36 
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/changes/bug18812 b/changes/bug18812
new file mode 100644
index 000..793e110
--- /dev/null
+++ b/changes/bug18812
@@ -0,0 +1,4 @@
+  o Minor bugfixes (bootstrap):
+- When a fallback changes its fingerprint from the hard-coded
+  fingerprint, log a less severe, more explanatory log message.
+  Fixes bug 18812; bugfix on 0.2.8.1-alpha. Patch by teor.
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 19a1718..5c4461f 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -31,6 +31,7 @@
 #include "geoip.h"
 #include "main.h"
 #include "link_handshake.h"
+#include "microdesc.h"
 #include "networkstatus.h"
 #include "nodelist.h"
 #include "reasons.h"
@@ -1706,6 +1707,9 @@ connection_or_check_valid_tls_handshake(or_connection_t 
*conn,
  *  - log a protocol warning whenever the fingerprints don't match;
  * On clients:
  *  - if a relay's fingerprint doesn't match, log a warning;
+ *  - if we don't have updated relay fingerprints from a recent consensus, and
+ *a fallback directory mirror's hard-coded fingerprint has changed, log an
+ *info explaining that we will try another fallback.
  *
  * If we're testing reachability, remember what we learned.
  *
@@ -1740,19 +1744,43 @@ connection_or_client_learned_peer_id(or_connection_t 
*conn,
 base16_encode(seen, sizeof(seen), (const char*)peer_id, DIGEST_LEN);
 base16_encode(expected, sizeof(expected), conn->identity_digest,
   DIGEST_LEN);
+const int using_hardcoded_fingerprints =
+  !networkstatus_get_reasonably_live_consensus(time(NULL),
+   usable_consensus_flavor());
+const int is_fallback_fingerprint = router_digest_is_fallback_dir(
+   conn->identity_digest);
+const int is_authority_fingerprint = router_digest_is_trusted_dir(
+  
conn->identity_digest);
 int severity;
+const char *extra_log = "";
 
 if (server_mode(options)) {
   severity = LOG_PROTOCOL_WARN;
 } else {
-  /* a relay has changed its fingerprint from the one in the consensus */
-  severity = LOG_WARN;
+  if (using_hardcoded_fingerprints) {
+/* We need to do the checks in this order, because the list of
+ * fallbacks includes the list of authorities */
+if (is_authority_fingerprint) {
+  severity = LOG_WARN;
+} else if (is_fallback_fingerprint) {
+  /* we expect a small number of fallbacks to change from their
+   * hard-coded fingerprints over the life of a release */
+  severity = LOG_INFO;
+  extra_log = " Tor will try a different fallback.";
+} else {
+  /* it's a bridge, it's either a misconfiguration, or unexpected */
+  severity = LOG_WARN;
+}
+  } else {
+/* a relay has changed its fingerprint from the one in the consensus */
+severity = LOG_WARN;
+  }
 }
 
 log_fn(severity, LD_HANDSHAKE,
"Tried connecting to router at %s:%d, but identity key was not "
-   "as expected: wanted %s but got %s.",
-   conn->base_.address, conn->base_.port, expected, seen);
+   "as expected: wanted %s but got %s.%s",
+   conn->base_.address, conn->base_.port, expected, seen, extra_log);
 entry_guard_register_connect_status(conn->identity_digest, 0, 1,
 time(NULL));
 control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED,



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

[tor-commits] [tor/master] whitespace fixes

2016-06-28 Thread nickm 
commit bc9a0f82b3436dad2aa09c1b68c0c230751d48dd
Author: Nick Mathewson 
Date:   Tue Jun 28 11:14:42 2016 -0400

whitespace fixes
---
 src/or/connection_or.c | 2 +-
 src/or/routerlist.c| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 5c4461f..9730e1a 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1750,7 +1750,7 @@ connection_or_client_learned_peer_id(or_connection_t 
*conn,
 const int is_fallback_fingerprint = router_digest_is_fallback_dir(
conn->identity_digest);
 const int is_authority_fingerprint = router_digest_is_trusted_dir(
-  
conn->identity_digest);
+   conn->identity_digest);
 int severity;
 const char *extra_log = "";
 
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 432c64d..49d7680 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1408,7 +1408,7 @@ router_get_fallback_dirserver_by_digest(const char 
*digest)
  * or 0 if no such fallback is in the list of fallback_dir_servers.
  * (fallback_dir_servers is affected by the FallbackDir and
  * UseDefaultFallbackDirs torrc options.)
- * The list of fallback directories includes the list of authorities.
+ * The list of fallback directories includes the list of authorities.
  */
 int
 router_digest_is_fallback_dir(const char *digest)



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

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

2016-06-28 Thread translation 
commit 5a9d1a00b33ace67ed56ada702e7516aa1cda4df
Author: Translation commit bot 
Date:   Tue Jun 28 15:16:39 2016 +

Update translations for torbutton-torbuttonproperties
---
 eu/torbutton.properties | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eu/torbutton.properties b/eu/torbutton.properties
index 9aeb0b3..e52cc0e 100644
--- a/eu/torbutton.properties
+++ b/eu/torbutton.properties
@@ -5,7 +5,7 @@ torbutton.circuit_display.this_browser = Nagibatzaile hau
 torbutton.circuit_display.relay = errele
 torbutton.circuit_display.tor_bridge = Zubia
 torbutton.circuit_display.unknown_country = Herrialde ezezaguna
-torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make 
the width and height of your window less distinctive, and thus reduces the 
ability of people to track you online.
+torbutton.content_sizer.margin_tooltip = Tor nabigatzaileak marjin hau 
gehitzen du zure lehioaren zabalera eta altuera ez hain bereizgarria egiteko, 
horrela norbaitek zure jarraipena egiteko gaitasuna murriztuz.
 torbutton.panel.tooltip.disabled = Sakatu Tor gaitzeko
 torbutton.panel.tooltip.enabled = Sakatu Tor ezgaitzeko
 torbutton.panel.label.disabled = Tor Ezgaitua
@@ -36,10 +36,10 @@ torbutton.popup.confirm_plugins = Flash bezalako pluginek 
zure pribatutasuna eta
 torbutton.popup.never_ask_again = Ez nazazu galdetu berriz
 torbutton.popup.confirm_newnym = Tor nabigatzaileak lehio eta fitxa guztiak 
itxiko ditu. Webguneen saio guztiak galdutko dira.\n\nTor nabigatzailea orain 
berrabiarazi zure nortasuna berrezartzeko?\n
 
-torbutton.slider_notification = The green onion menu now has a security slider 
which lets you adjust your security level. Check it out!
+torbutton.slider_notification = Tipula berdearen menua orain zure segurtasun 
maila egokitzen uzten dizun barra bat du. Proba ezazu!
 torbutton.slider_notification_button = Segurtasun aukerak ireki
 
-torbutton.maximize_warning = Maximizing Tor Browser can allow websites to 
determine your monitor size, which can be used to track you. We recommend that 
you leave Tor Browser windows in their original default size.
+torbutton.maximize_warning = Tor nabigatzailea maximizatzeak webguneek zure 
pantailaren neurria zehaztea baimendu dezake, eta zure jarraipena egiteko 
erabili daiteke. Tor nabigatzailearen lehioa neurri lehenetsian uztea 
gomendatzen dugu.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=Webgune hau (% S) HTML5 canvas irudi datuak ateratzen saiatu 
da, eta zure ordenagailua identifikatzeko erabil daitezke.\n\nTor Nabigatzailea 
baimendu nahi duzu webgune honetan HTML5 canvas irudiaren datuak ateratzeko?
@@ -55,5 +55,5 @@ canvas.neverAccessKey=e
 profileProblemTitle=%S Profilarekin Arazoa
 profileReadOnly=Ezin duzu %S exekutatu irakurtzeko soilik den fitxategi 
sistema batetik. Mesedez kopiatu ezazu %S beste leku batean erabiltzen saiatu 
baino lehenago.
 profileReadOnlyMac=Ezin duzu %S exekutatu irakurtzeko soilik den fitxategi 
sistema batetik. Mesedez kopiatu %S zure mahaigain edo aplikazioen karpetara 
erabiltzen saiatu baino lehenago.
-profileAccessDenied=%S does not have permission to access the profile. Please 
adjust your file system permissions and try again.
-profileMigrationFailed=Migration of your existing %S profile failed.\nNew 
settings will be used.
+profileAccessDenied=%S ez du profilera sartzeko baimenik. Mesedez egokitu 
itzazu zure fitxategi sistemaren baimenak eta berriz saiatu.
+profileMigrationFailed=Zure %S profilaren migrazioak huts egin du.\nEzarpen 
berriak erabiliko dira.

___
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.8] Make it clear that fallbacks include authorities

2016-06-28 Thread nickm 
commit 812fd416eff4fa7326cbd4bd46ff0f5801b9034c
Author: teor (Tim Wilson-Brown) 
Date:   Tue Jun 28 14:14:04 2016 +1000

Make it clear that fallbacks include authorities

Comment-only change
---
 src/or/routerlist.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index d49814f..d7faf78 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1384,6 +1384,7 @@ router_get_trusteddirserver_by_digest(const char *digest)
  * key hashes to digest, or NULL if no such fallback is in the list of
  * fallback_dir_servers. (fallback_dir_servers is affected by the FallbackDir
  * and UseDefaultFallbackDirs torrc options.)
+ * The list of fallback directories includes the list of authorities.
  */
 dir_server_t *
 router_get_fallback_dirserver_by_digest(const char *digest)
@@ -1407,6 +1408,7 @@ router_get_fallback_dirserver_by_digest(const char 
*digest)
  * or 0 if no such fallback is in the list of fallback_dir_servers.
  * (fallback_dir_servers is affected by the FallbackDir and
  * UseDefaultFallbackDirs torrc options.)
+ * The list of fallback directories includes the list of authorities.
  */
 int
 router_digest_is_fallback_dir(const char *digest)



___
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.8] Merge remote-tracking branch 'teor/bug18812' into maint-0.2.8

2016-06-28 Thread nickm 
commit f87aa4555d06b2707e21df39d1bc7f14161a2cb4
Merge: 0116eae 608c12b
Author: Nick Mathewson 
Date:   Tue Jun 28 11:12:51 2016 -0400

Merge remote-tracking branch 'teor/bug18812' into maint-0.2.8

 changes/bug18812   |  4 
 src/or/connection_or.c | 51 +-
 src/or/routerlist.c|  2 ++
 3 files changed, 52 insertions(+), 5 deletions(-)




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

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

2016-06-28 Thread translation 
commit c4bc282475147bc3cd42c88288e571235c43ad52
Author: Translation commit bot 
Date:   Tue Jun 28 15:18:45 2016 +

Update translations for torbutton-abouttbupdatedtd_completed
---
 eu/abouttbupdate.dtd | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/eu/abouttbupdate.dtd b/eu/abouttbupdate.dtd
new file mode 100644
index 000..5f2178b
--- /dev/null
+++ b/eu/abouttbupdate.dtd
@@ -0,0 +1,6 @@
+
+
+
+
+
+

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

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

2016-06-28 Thread translation 
commit f115446141812719bad5cac63ee2f4562c40db68
Author: Translation commit bot 
Date:   Tue Jun 28 15:17:06 2016 +

Update translations for torbutton-aboutdialogdtd
---
 eu/aboutdialog.dtd | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eu/aboutdialog.dtd b/eu/aboutdialog.dtd
index ec77d08..1c6f7e0 100644
--- a/eu/aboutdialog.dtd
+++ b/eu/aboutdialog.dtd
@@ -1,19 +1,19 @@
-
+
 
-
-
+
+
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
-
+

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

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

2016-06-28 Thread translation 
commit 750d4a68f321b44955f2ec3e082b07597694a74c
Author: Translation commit bot 
Date:   Tue Jun 28 15:17:10 2016 +

Update translations for torbutton-aboutdialogdtd_completed
---
 eu/aboutdialog.dtd | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/eu/aboutdialog.dtd b/eu/aboutdialog.dtd
new file mode 100644
index 000..1c6f7e0
--- /dev/null
+++ b/eu/aboutdialog.dtd
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

___
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

2016-06-28 Thread translation 
commit 6b003ac116a9fc260264a7cbce01662fa3ca768d
Author: Translation commit bot 
Date:   Tue Jun 28 15:17:16 2016 +

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

diff --git a/eu/abouttor.properties b/eu/abouttor.properties
new file mode 100644
index 000..30a7858
--- /dev/null
+++ b/eu/abouttor.properties
@@ -0,0 +1,21 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Bilatumodu seguruan ondokoarekin: 
Hasierako orria.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Bilatumodu seguruan 
ondokoarekin: DuckDuckGo.
+# The following string is a link which replaces %1$S above.
+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.searchDC.privacy=Bilatumodu seguruan ondokoarekin: 
Disconnect.me.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/

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

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

2016-06-28 Thread translation 
commit 14ea7303b93378b5c69ac774e5d1a71423c87133
Author: Translation commit bot 
Date:   Tue Jun 28 15:16:42 2016 +

Update translations for torbutton-torbuttondtd
---
 eu/torbutton.dtd | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eu/torbutton.dtd b/eu/torbutton.dtd
index a8b1aa2..4e2cd63 100644
--- a/eu/torbutton.dtd
+++ b/eu/torbutton.dtd
@@ -62,22 +62,22 @@
 
 
 
-
-
+
+
 
-
+
 
 
 
 
 
-
+
 
 
 
 
 
-
+
 
-
+
 

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

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

2016-06-28 Thread translation 
commit 380dda69319ac192fe7089f8bb22678454e92c8c
Author: Translation commit bot 
Date:   Tue Jun 28 14:46:41 2016 +

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

diff --git a/eu/torbutton.properties b/eu/torbutton.properties
index 2978e41..9aeb0b3 100644
--- a/eu/torbutton.properties
+++ b/eu/torbutton.properties
@@ -2,7 +2,7 @@ torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = IP ezezaguna
 torbutton.circuit_display.onion_site = Onion webgunea
 torbutton.circuit_display.this_browser = Nagibatzaile hau
-torbutton.circuit_display.relay = relay
+torbutton.circuit_display.relay = errele
 torbutton.circuit_display.tor_bridge = Zubia
 torbutton.circuit_display.unknown_country = Herrialde ezezaguna
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make 
the width and height of your window less distinctive, and thus reduces the 
ability of people to track you online.
@@ -34,7 +34,7 @@ torbutton.popup.short_torbrowser = Torbutton informazio 
garrantzitsua!\n\nTorbut
 
 torbutton.popup.confirm_plugins = Flash bezalako pluginek zure pribatutasuna 
eta anonimotasuna kaltetu dezakete.\n\nTor saltatu dezakete zure uneko 
kokalekua eta IP helbidea erakusteko.\n\nPluginak gaitu nahi dituzulaz ziur al 
zaude?\n\n
 torbutton.popup.never_ask_again = Ez nazazu galdetu berriz
-torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. 
All website sessions will be lost.\n\nRestart Tor Browser now to reset your 
identity?\n\n
+torbutton.popup.confirm_newnym = Tor nabigatzaileak lehio eta fitxa guztiak 
itxiko ditu. Webguneen saio guztiak galdutko dira.\n\nTor nabigatzailea orain 
berrabiarazi zure nortasuna berrezartzeko?\n
 
 torbutton.slider_notification = The green onion menu now has a security slider 
which lets you adjust your security level. Check it out!
 torbutton.slider_notification_button = Segurtasun aukerak ireki
@@ -53,7 +53,7 @@ canvas.neverAccessKey=e
 # Profile/startup error messages. Strings are kept here for ease of 
translation.
 # LOCALIZATION NOTE: %S is the application name.
 profileProblemTitle=%S Profilarekin Arazoa
-profileReadOnly=You cannot run %S from a read-only file system.  Please copy 
%S to another location before trying to use it.
-profileReadOnlyMac=You cannot run %S from a read-only file system.  Please 
copy %S to your Desktop or Applications folder before trying to use it.
+profileReadOnly=Ezin duzu %S exekutatu irakurtzeko soilik den fitxategi 
sistema batetik. Mesedez kopiatu ezazu %S beste leku batean erabiltzen saiatu 
baino lehenago.
+profileReadOnlyMac=Ezin duzu %S exekutatu irakurtzeko soilik den fitxategi 
sistema batetik. Mesedez kopiatu %S zure mahaigain edo aplikazioen karpetara 
erabiltzen saiatu baino lehenago.
 profileAccessDenied=%S does not have permission to access the profile. Please 
adjust your file system permissions and try again.
 profileMigrationFailed=Migration of your existing %S profile failed.\nNew 
settings will be used.

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

[tor-commits] [atlas/master] Adds a list of the top 10 relays by consensus weight (Fixes: #5430)

2016-06-28 Thread phw 
commit 4cff4597819a93412d2db14dd6f6cc7625009aa6
Author: Iain R. Learmonth 
Date:   Sun Jun 19 18:48:01 2016 +0100

Adds a list of the top 10 relays by consensus weight (Fixes: #5430)

 * Adds a navbar to the top of the page for Home, About and Top 10
   Relays.
 * Re-uses the search results view using a hardcoded Onionoo URL (taken
   from Globe) to show a list of the top 10 relays by consensus weight.
 * Disables sorting by default of the datatables, and disables saving of
   state for sorting options. This allows the list of the top 10 to be
   sorted by consensus weight as reported by Onionoo, though manual
   sorting is still possible as before.
---
 index.html|  7 ++-
 js/router.js  | 24 
 js/views/search/do.js |  3 ++-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index b3297a1..5588c23 100644
--- a/index.html
+++ b/index.html
@@ -36,7 +36,12 @@
   
 
   
-
+  
+Home
+About
+Top 10 Relays
+  
+
 
 
 
diff --git a/js/router.js b/js/router.js
index 92b2647..f79e933 100644
--- a/js/router.js
+++ b/js/router.js
@@ -14,6 +14,7 @@ define([
// Define the routes for the actions in Atlas
'details/:fingerprint': 'mainDetails',
'search/:query': 'doSearch',
+   'top10': 'showTop10',
'about': 'showAbout',
// Default
'*actions': 'defaultAction'
@@ -81,6 +82,29 @@ define([
 });
 }
 },
+showTop10: function(){
+$("#home").removeClass("active");
+$("#about").removeClass("active");
+
+$("#loading").show();
+$("#content").hide();
+
+doSearchView.collection.url = 
"https://onionoo.torproject.org/summary?type=relay=-consensus_weight=10=true;;
+doSearchView.collection.lookup({
+success: function(relays){
+$("#content").show();
+doSearchView.relays = doSearchView.collection.models;
+doSearchView.render("");
+$("#loading").hide();
+},
+
+error: function(erno){
+$("#content").show();
+doSearchView.error(erno);
+$("#loading").hide();
+}
+});
+},
 // Display the Atlas about page
 showAbout: function(){
 $("#home").removeClass("active");
diff --git a/js/views/search/do.js b/js/views/search/do.js
index 5e077ec..77a6b02 100644
--- a/js/views/search/do.js
+++ b/js/views/search/do.js
@@ -156,7 +156,8 @@ define([
var oTable = $('#torstatus_results').dataTable({
// Save the state of the tables
 "sDom": "<'row'<'span6'l><'span6 
hide'f>r>t<'row'<'span6'i><'span6'p>>",
-   "bStateSave": true
+   "bStateSave": false,
+   "aaSorting": []
});
 // Make the tooltips
 $(".flags").tooltip();



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

[tor-commits] [atlas/master] Adds a title to the search results page

2016-06-28 Thread phw 
commit 223aec37d3b96556da949bf18d72298aa3c9b675
Author: Iain R. Learmonth 
Date:   Mon Jun 20 23:37:43 2016 +0100

Adds a title to the search results page

 * Displays the search query for searches
 * Displays "Top 10 Relays by Consensus Weight" for the top 10 page to
   avoid confusion as to why the top 10 are not sorted by bandwidth
   (#5430)
---
 js/router.js | 2 ++
 templates/search/do.html | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/js/router.js b/js/router.js
index f79e933..c5ce942 100644
--- a/js/router.js
+++ b/js/router.js
@@ -71,6 +71,7 @@ define([
 $("#content").show();
 doSearchView.relays = doSearchView.collection.models;
 doSearchView.render(query);
+   $("#search-title").text(query);
 $("#loading").hide();
 },
 
@@ -95,6 +96,7 @@ define([
 $("#content").show();
 doSearchView.relays = doSearchView.collection.models;
 doSearchView.render("");
+   $("#search-title").text("Top 10 Relays by Consensus 
Weight");
 $("#loading").hide();
 },
 
diff --git a/templates/search/do.html b/templates/search/do.html
index dfb0fc1..2f3b0b2 100644
--- a/templates/search/do.html
+++ b/templates/search/do.html
@@ -28,6 +28,8 @@
 
 <% } %>
 <% } else { %>
+
+
 





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