date:20200707

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

2020-07-07 Thread ahf

commit e4bfa734a60555a1871a008c2a125fe55d564aa1
Merge: 9e33391eb 9603d8af0
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Jul 8 00:36:48 2020 +

Merge branch 'maint-0.4.4'

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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

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

2020-07-07 Thread ahf

commit c364e0e83bd98bf66b68cdacff28ad6c5924abf5
Merge: a213d2793 b81e24cda
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Jul 8 00:36:48 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)




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

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

2020-07-07 Thread ahf

commit bd7174bb98af05f05d3220f12e8aec9cd68b3e1a
Merge: be3baeb87 b81e24cda
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Jul 8 00:36:48 2020 +

Merge branch 'maint-0.4.2' into release-0.4.2

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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

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

2020-07-07 Thread ahf

commit b81e24cda687e9633c18b741ed92ce6bafb77643
Merge: 19d579e8c 3e08dd9df
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Jul 8 00:36:47 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-07-07 Thread ahf

commit b81e24cda687e9633c18b741ed92ce6bafb77643
Merge: 19d579e8c 3e08dd9df
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Jul 8 00:36:47 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)



___
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.4.2' into maint-0.4.3

2020-07-07 Thread ahf

commit c364e0e83bd98bf66b68cdacff28ad6c5924abf5
Merge: a213d2793 b81e24cda
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Jul 8 00:36:48 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)




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

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

2020-07-07 Thread ahf

commit cee58b7f92048a16745f17813d18fa272d34ef70
Merge: dc45f0a8c c364e0e83
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Jul 8 00:36:48 2020 +

Merge branch 'maint-0.4.3' into release-0.4.3

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-07-07 Thread ahf

commit c364e0e83bd98bf66b68cdacff28ad6c5924abf5
Merge: a213d2793 b81e24cda
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Jul 8 00:36:48 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)




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

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-07-07 Thread ahf

commit c364e0e83bd98bf66b68cdacff28ad6c5924abf5
Merge: a213d2793 b81e24cda
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Jul 8 00:36:48 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)




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

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-07-07 Thread ahf

commit b81e24cda687e9633c18b741ed92ce6bafb77643
Merge: 19d579e8c 3e08dd9df
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Jul 8 00:36:47 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)



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

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

2020-07-07 Thread ahf

commit d9736049816eca47ae27be66642856759167296f
Merge: 80ae7d305 9603d8af0
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Jul 8 00:36:48 2020 +

Merge branch 'maint-0.4.4' into release-0.4.4

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

___
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.4.3' into maint-0.4.4

2020-07-07 Thread ahf

commit 9603d8af0b36dc8faf297c2a300becebfc2f721b
Merge: d4c79cae7 c364e0e83
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Jul 8 00:36:48 2020 +

Merge branch 'maint-0.4.3' into maint-0.4.4

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/release-0.4.4] Resolve a compiler warning from a 32-bit signed/unsigned comparison

2020-07-07 Thread ahf

commit 3e08dd9df1142b66e5f53a55d7e4c2803c3f9868
Author: Nick Mathewson 
Date:   Tue Jul 7 14:58:49 2020 -0400

Resolve a compiler warning from a 32-bit signed/unsigned comparison

This warning only affects platforms (like win32) with 32-bit time_t.

Fixes bug 40028; bugfix on 0.3.2.8-rc.
---
 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug40028 b/changes/bug40028
new file mode 100644
index 0..cfd1ffe51
--- /dev/null
+++ b/changes/bug40028
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compiler warnings):
+- Fix a compiler warning on platforms with 32-bit time_t values.
+  Fixes bug 40028; bugfix on 0.3.2.8-rc.
diff --git a/src/lib/tls/x509.c b/src/lib/tls/x509.c
index 67a8b49b9..b4a0f8dab 100644
--- a/src/lib/tls/x509.c
+++ b/src/lib/tls/x509.c
@@ -23,6 +23,7 @@ tor_tls_pick_certificate_lifetime(time_t now,
   time_t *start_time_out,
   time_t *end_time_out)
 {
+  tor_assert(cert_lifetime < INT_MAX);
   time_t start_time, end_time;
   /* Make sure we're part-way through the certificate lifetime, rather
* than having it start right now. Don't choose quite uniformly, since
@@ -36,7 +37,7 @@ tor_tls_pick_certificate_lifetime(time_t now,
   const time_t start_granularity = 24*3600;
   time_t earliest_start_time;
   /* Don't actually start in the future! */
-  if (cert_lifetime <= min_real_lifetime + start_granularity) {
+  if ((int)cert_lifetime <= min_real_lifetime + start_granularity) {
 earliest_start_time = now - 1;
   } else {
 earliest_start_time = now + min_real_lifetime + start_granularity



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

[tor-commits] [tor/release-0.4.2] Resolve a compiler warning from a 32-bit signed/unsigned comparison

2020-07-07 Thread ahf

commit 3e08dd9df1142b66e5f53a55d7e4c2803c3f9868
Author: Nick Mathewson 
Date:   Tue Jul 7 14:58:49 2020 -0400

Resolve a compiler warning from a 32-bit signed/unsigned comparison

This warning only affects platforms (like win32) with 32-bit time_t.

Fixes bug 40028; bugfix on 0.3.2.8-rc.
---
 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug40028 b/changes/bug40028
new file mode 100644
index 0..cfd1ffe51
--- /dev/null
+++ b/changes/bug40028
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compiler warnings):
+- Fix a compiler warning on platforms with 32-bit time_t values.
+  Fixes bug 40028; bugfix on 0.3.2.8-rc.
diff --git a/src/lib/tls/x509.c b/src/lib/tls/x509.c
index 67a8b49b9..b4a0f8dab 100644
--- a/src/lib/tls/x509.c
+++ b/src/lib/tls/x509.c
@@ -23,6 +23,7 @@ tor_tls_pick_certificate_lifetime(time_t now,
   time_t *start_time_out,
   time_t *end_time_out)
 {
+  tor_assert(cert_lifetime < INT_MAX);
   time_t start_time, end_time;
   /* Make sure we're part-way through the certificate lifetime, rather
* than having it start right now. Don't choose quite uniformly, since
@@ -36,7 +37,7 @@ tor_tls_pick_certificate_lifetime(time_t now,
   const time_t start_granularity = 24*3600;
   time_t earliest_start_time;
   /* Don't actually start in the future! */
-  if (cert_lifetime <= min_real_lifetime + start_granularity) {
+  if ((int)cert_lifetime <= min_real_lifetime + start_granularity) {
 earliest_start_time = now - 1;
   } else {
 earliest_start_time = now + min_real_lifetime + start_granularity



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

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-07-07 Thread ahf

commit b81e24cda687e9633c18b741ed92ce6bafb77643
Merge: 19d579e8c 3e08dd9df
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Jul 8 00:36:47 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)



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

2020-07-07 Thread ahf

commit 22a7817995226ff9b466df5f87d6c11ecbf06731
Merge: 7759fee48 3e08dd9df
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Jul 8 00:36:47 2020 +

Merge branch 'maint-0.3.5' into release-0.3.5

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/master] Resolve a compiler warning from a 32-bit signed/unsigned comparison

2020-07-07 Thread ahf

commit 3e08dd9df1142b66e5f53a55d7e4c2803c3f9868
Author: Nick Mathewson 
Date:   Tue Jul 7 14:58:49 2020 -0400

Resolve a compiler warning from a 32-bit signed/unsigned comparison

This warning only affects platforms (like win32) with 32-bit time_t.

Fixes bug 40028; bugfix on 0.3.2.8-rc.
---
 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug40028 b/changes/bug40028
new file mode 100644
index 0..cfd1ffe51
--- /dev/null
+++ b/changes/bug40028
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compiler warnings):
+- Fix a compiler warning on platforms with 32-bit time_t values.
+  Fixes bug 40028; bugfix on 0.3.2.8-rc.
diff --git a/src/lib/tls/x509.c b/src/lib/tls/x509.c
index 67a8b49b9..b4a0f8dab 100644
--- a/src/lib/tls/x509.c
+++ b/src/lib/tls/x509.c
@@ -23,6 +23,7 @@ tor_tls_pick_certificate_lifetime(time_t now,
   time_t *start_time_out,
   time_t *end_time_out)
 {
+  tor_assert(cert_lifetime < INT_MAX);
   time_t start_time, end_time;
   /* Make sure we're part-way through the certificate lifetime, rather
* than having it start right now. Don't choose quite uniformly, since
@@ -36,7 +37,7 @@ tor_tls_pick_certificate_lifetime(time_t now,
   const time_t start_granularity = 24*3600;
   time_t earliest_start_time;
   /* Don't actually start in the future! */
-  if (cert_lifetime <= min_real_lifetime + start_granularity) {
+  if ((int)cert_lifetime <= min_real_lifetime + start_granularity) {
 earliest_start_time = now - 1;
   } else {
 earliest_start_time = now + min_real_lifetime + start_granularity



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

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

2020-07-07 Thread ahf

commit 9603d8af0b36dc8faf297c2a300becebfc2f721b
Merge: d4c79cae7 c364e0e83
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Jul 8 00:36:48 2020 +

Merge branch 'maint-0.4.3' into maint-0.4.4

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)



___
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.5] Resolve a compiler warning from a 32-bit signed/unsigned comparison

2020-07-07 Thread ahf

commit 3e08dd9df1142b66e5f53a55d7e4c2803c3f9868
Author: Nick Mathewson 
Date:   Tue Jul 7 14:58:49 2020 -0400

Resolve a compiler warning from a 32-bit signed/unsigned comparison

This warning only affects platforms (like win32) with 32-bit time_t.

Fixes bug 40028; bugfix on 0.3.2.8-rc.
---
 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug40028 b/changes/bug40028
new file mode 100644
index 0..cfd1ffe51
--- /dev/null
+++ b/changes/bug40028
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compiler warnings):
+- Fix a compiler warning on platforms with 32-bit time_t values.
+  Fixes bug 40028; bugfix on 0.3.2.8-rc.
diff --git a/src/lib/tls/x509.c b/src/lib/tls/x509.c
index 67a8b49b9..b4a0f8dab 100644
--- a/src/lib/tls/x509.c
+++ b/src/lib/tls/x509.c
@@ -23,6 +23,7 @@ tor_tls_pick_certificate_lifetime(time_t now,
   time_t *start_time_out,
   time_t *end_time_out)
 {
+  tor_assert(cert_lifetime < INT_MAX);
   time_t start_time, end_time;
   /* Make sure we're part-way through the certificate lifetime, rather
* than having it start right now. Don't choose quite uniformly, since
@@ -36,7 +37,7 @@ tor_tls_pick_certificate_lifetime(time_t now,
   const time_t start_granularity = 24*3600;
   time_t earliest_start_time;
   /* Don't actually start in the future! */
-  if (cert_lifetime <= min_real_lifetime + start_granularity) {
+  if ((int)cert_lifetime <= min_real_lifetime + start_granularity) {
 earliest_start_time = now - 1;
   } else {
 earliest_start_time = now + min_real_lifetime + start_granularity



___
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.5' into maint-0.4.2

2020-07-07 Thread ahf

commit b81e24cda687e9633c18b741ed92ce6bafb77643
Merge: 19d579e8c 3e08dd9df
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Jul 8 00:36:47 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/maint-0.4.2] Resolve a compiler warning from a 32-bit signed/unsigned comparison

2020-07-07 Thread ahf

commit 3e08dd9df1142b66e5f53a55d7e4c2803c3f9868
Author: Nick Mathewson 
Date:   Tue Jul 7 14:58:49 2020 -0400

Resolve a compiler warning from a 32-bit signed/unsigned comparison

This warning only affects platforms (like win32) with 32-bit time_t.

Fixes bug 40028; bugfix on 0.3.2.8-rc.
---
 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug40028 b/changes/bug40028
new file mode 100644
index 0..cfd1ffe51
--- /dev/null
+++ b/changes/bug40028
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compiler warnings):
+- Fix a compiler warning on platforms with 32-bit time_t values.
+  Fixes bug 40028; bugfix on 0.3.2.8-rc.
diff --git a/src/lib/tls/x509.c b/src/lib/tls/x509.c
index 67a8b49b9..b4a0f8dab 100644
--- a/src/lib/tls/x509.c
+++ b/src/lib/tls/x509.c
@@ -23,6 +23,7 @@ tor_tls_pick_certificate_lifetime(time_t now,
   time_t *start_time_out,
   time_t *end_time_out)
 {
+  tor_assert(cert_lifetime < INT_MAX);
   time_t start_time, end_time;
   /* Make sure we're part-way through the certificate lifetime, rather
* than having it start right now. Don't choose quite uniformly, since
@@ -36,7 +37,7 @@ tor_tls_pick_certificate_lifetime(time_t now,
   const time_t start_granularity = 24*3600;
   time_t earliest_start_time;
   /* Don't actually start in the future! */
-  if (cert_lifetime <= min_real_lifetime + start_granularity) {
+  if ((int)cert_lifetime <= min_real_lifetime + start_granularity) {
 earliest_start_time = now - 1;
   } else {
 earliest_start_time = now + min_real_lifetime + start_granularity



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

[tor-commits] [tor/maint-0.4.4] Resolve a compiler warning from a 32-bit signed/unsigned comparison

2020-07-07 Thread ahf

commit 3e08dd9df1142b66e5f53a55d7e4c2803c3f9868
Author: Nick Mathewson 
Date:   Tue Jul 7 14:58:49 2020 -0400

Resolve a compiler warning from a 32-bit signed/unsigned comparison

This warning only affects platforms (like win32) with 32-bit time_t.

Fixes bug 40028; bugfix on 0.3.2.8-rc.
---
 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug40028 b/changes/bug40028
new file mode 100644
index 0..cfd1ffe51
--- /dev/null
+++ b/changes/bug40028
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compiler warnings):
+- Fix a compiler warning on platforms with 32-bit time_t values.
+  Fixes bug 40028; bugfix on 0.3.2.8-rc.
diff --git a/src/lib/tls/x509.c b/src/lib/tls/x509.c
index 67a8b49b9..b4a0f8dab 100644
--- a/src/lib/tls/x509.c
+++ b/src/lib/tls/x509.c
@@ -23,6 +23,7 @@ tor_tls_pick_certificate_lifetime(time_t now,
   time_t *start_time_out,
   time_t *end_time_out)
 {
+  tor_assert(cert_lifetime < INT_MAX);
   time_t start_time, end_time;
   /* Make sure we're part-way through the certificate lifetime, rather
* than having it start right now. Don't choose quite uniformly, since
@@ -36,7 +37,7 @@ tor_tls_pick_certificate_lifetime(time_t now,
   const time_t start_granularity = 24*3600;
   time_t earliest_start_time;
   /* Don't actually start in the future! */
-  if (cert_lifetime <= min_real_lifetime + start_granularity) {
+  if ((int)cert_lifetime <= min_real_lifetime + start_granularity) {
 earliest_start_time = now - 1;
   } else {
 earliest_start_time = now + min_real_lifetime + start_granularity



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

[tor-commits] [tor/release-0.4.3] Resolve a compiler warning from a 32-bit signed/unsigned comparison

2020-07-07 Thread ahf

commit 3e08dd9df1142b66e5f53a55d7e4c2803c3f9868
Author: Nick Mathewson 
Date:   Tue Jul 7 14:58:49 2020 -0400

Resolve a compiler warning from a 32-bit signed/unsigned comparison

This warning only affects platforms (like win32) with 32-bit time_t.

Fixes bug 40028; bugfix on 0.3.2.8-rc.
---
 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug40028 b/changes/bug40028
new file mode 100644
index 0..cfd1ffe51
--- /dev/null
+++ b/changes/bug40028
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compiler warnings):
+- Fix a compiler warning on platforms with 32-bit time_t values.
+  Fixes bug 40028; bugfix on 0.3.2.8-rc.
diff --git a/src/lib/tls/x509.c b/src/lib/tls/x509.c
index 67a8b49b9..b4a0f8dab 100644
--- a/src/lib/tls/x509.c
+++ b/src/lib/tls/x509.c
@@ -23,6 +23,7 @@ tor_tls_pick_certificate_lifetime(time_t now,
   time_t *start_time_out,
   time_t *end_time_out)
 {
+  tor_assert(cert_lifetime < INT_MAX);
   time_t start_time, end_time;
   /* Make sure we're part-way through the certificate lifetime, rather
* than having it start right now. Don't choose quite uniformly, since
@@ -36,7 +37,7 @@ tor_tls_pick_certificate_lifetime(time_t now,
   const time_t start_granularity = 24*3600;
   time_t earliest_start_time;
   /* Don't actually start in the future! */
-  if (cert_lifetime <= min_real_lifetime + start_granularity) {
+  if ((int)cert_lifetime <= min_real_lifetime + start_granularity) {
 earliest_start_time = now - 1;
   } else {
 earliest_start_time = now + min_real_lifetime + start_granularity



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

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-07-07 Thread ahf

commit b81e24cda687e9633c18b741ed92ce6bafb77643
Merge: 19d579e8c 3e08dd9df
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Jul 8 00:36:47 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-07-07 Thread ahf

commit c364e0e83bd98bf66b68cdacff28ad6c5924abf5
Merge: a213d2793 b81e24cda
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Jul 8 00:36:48 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-07-07 Thread ahf

commit b81e24cda687e9633c18b741ed92ce6bafb77643
Merge: 19d579e8c 3e08dd9df
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Jul 8 00:36:47 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-07-07 Thread ahf

commit 9603d8af0b36dc8faf297c2a300becebfc2f721b
Merge: d4c79cae7 c364e0e83
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Jul 8 00:36:48 2020 +

Merge branch 'maint-0.4.3' into maint-0.4.4

 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

___
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.5] Resolve a compiler warning from a 32-bit signed/unsigned comparison

2020-07-07 Thread ahf

commit 3e08dd9df1142b66e5f53a55d7e4c2803c3f9868
Author: Nick Mathewson 
Date:   Tue Jul 7 14:58:49 2020 -0400

Resolve a compiler warning from a 32-bit signed/unsigned comparison

This warning only affects platforms (like win32) with 32-bit time_t.

Fixes bug 40028; bugfix on 0.3.2.8-rc.
---
 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug40028 b/changes/bug40028
new file mode 100644
index 0..cfd1ffe51
--- /dev/null
+++ b/changes/bug40028
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compiler warnings):
+- Fix a compiler warning on platforms with 32-bit time_t values.
+  Fixes bug 40028; bugfix on 0.3.2.8-rc.
diff --git a/src/lib/tls/x509.c b/src/lib/tls/x509.c
index 67a8b49b9..b4a0f8dab 100644
--- a/src/lib/tls/x509.c
+++ b/src/lib/tls/x509.c
@@ -23,6 +23,7 @@ tor_tls_pick_certificate_lifetime(time_t now,
   time_t *start_time_out,
   time_t *end_time_out)
 {
+  tor_assert(cert_lifetime < INT_MAX);
   time_t start_time, end_time;
   /* Make sure we're part-way through the certificate lifetime, rather
* than having it start right now. Don't choose quite uniformly, since
@@ -36,7 +37,7 @@ tor_tls_pick_certificate_lifetime(time_t now,
   const time_t start_granularity = 24*3600;
   time_t earliest_start_time;
   /* Don't actually start in the future! */
-  if (cert_lifetime <= min_real_lifetime + start_granularity) {
+  if ((int)cert_lifetime <= min_real_lifetime + start_granularity) {
 earliest_start_time = now - 1;
   } else {
 earliest_start_time = now + min_real_lifetime + start_granularity

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

[tor-commits] [tor/maint-0.4.3] Resolve a compiler warning from a 32-bit signed/unsigned comparison

2020-07-07 Thread ahf

commit 3e08dd9df1142b66e5f53a55d7e4c2803c3f9868
Author: Nick Mathewson 
Date:   Tue Jul 7 14:58:49 2020 -0400

Resolve a compiler warning from a 32-bit signed/unsigned comparison

This warning only affects platforms (like win32) with 32-bit time_t.

Fixes bug 40028; bugfix on 0.3.2.8-rc.
---
 changes/bug40028   | 3 +++
 src/lib/tls/x509.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug40028 b/changes/bug40028
new file mode 100644
index 0..cfd1ffe51
--- /dev/null
+++ b/changes/bug40028
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compiler warnings):
+- Fix a compiler warning on platforms with 32-bit time_t values.
+  Fixes bug 40028; bugfix on 0.3.2.8-rc.
diff --git a/src/lib/tls/x509.c b/src/lib/tls/x509.c
index 67a8b49b9..b4a0f8dab 100644
--- a/src/lib/tls/x509.c
+++ b/src/lib/tls/x509.c
@@ -23,6 +23,7 @@ tor_tls_pick_certificate_lifetime(time_t now,
   time_t *start_time_out,
   time_t *end_time_out)
 {
+  tor_assert(cert_lifetime < INT_MAX);
   time_t start_time, end_time;
   /* Make sure we're part-way through the certificate lifetime, rather
* than having it start right now. Don't choose quite uniformly, since
@@ -36,7 +37,7 @@ tor_tls_pick_certificate_lifetime(time_t now,
   const time_t start_granularity = 24*3600;
   time_t earliest_start_time;
   /* Don't actually start in the future! */
-  if (cert_lifetime <= min_real_lifetime + start_granularity) {
+  if ((int)cert_lifetime <= min_real_lifetime + start_granularity) {
 earliest_start_time = now - 1;
   } else {
 earliest_start_time = now + min_real_lifetime + start_granularity



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

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2020-07-07 Thread translation

commit 5c10faf813f5790c8275c96871bfb1f0a0a39813
Author: Translation commit bot 
Date:   Tue Jul 7 22:47:52 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+ka.po | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/contents+ka.po b/contents+ka.po
index 436c2d14aa..b093540443 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -11610,11 +11610,16 @@ msgid ""
 "This abuse results in IP-specific temporary bans (\"klines\" in IRC lingo), "
 "as the network operators try to keep the troll off of their network."
 msgstr ""
+"áá ááá á¦ááááááá¡ á¨áááááá áá 
áªááááá£áá IP áá ááááá ááá¦á£áááá 
(âklinesâ, ááááá  "
+"âá¡áááááááá¡ á®áááá ááááááá¡â 
IRC-ááááá), á áá á¥á¡áááá¡ 
áááááá®ááááááá á¨áá«ááá¡ á¢á áááá¡"
+" áááªááááá áá á®áááá."
 
 #: https//support.torproject.org/abuse/tor-ban-irc/
 #: (content/abuse/irc-ban/contents+en.lrquestion.description)
 msgid "This response underscores a fundamental flaw in IRC's security model:"
 msgstr ""
+"áááááá á á¡áááá¡á£á®á ááá¥áááááá 
ááááááááá á«áá áá£áá áááááá IRC-áá¡ 
á£á¡áá¤á áá®ááááá¡ "
+"áááááá¨á:"
 
 #: https//support.torproject.org/abuse/tor-ban-irc/
 #: (content/abuse/irc-ban/contents+en.lrquestion.description)
@@ -11622,6 +11627,8 @@ msgid ""
 "they assume that IP addresses equate to humans, and by banning the IP "
 "address they can ban the human."
 msgstr ""
+"áá¡ááá áááá©ááááá, á áá 
IP-ááá¡áááá áá á¬áá áááááááá¡ 
áªááááá£á ááá ááááááá¡ áá IP-"
+"ááá¡áááá ááá¡ á¨ááá¦á£áááá áá ááá 
á¡ áá¦á£ááááá."
 
 #: https//support.torproject.org/abuse/tor-ban-irc/
 #: (content/abuse/irc-ban/contents+en.lrquestion.description)
@@ -11630,6 +11637,8 @@ msgid ""
 "the literally millions of open proxies and compromised computers around the "
 "Internet."
 msgstr ""
+"á¡áááááááááá¨á áá áá¡á áá áá â á¢á 
áááááá¡ á£ááá¢áá¡ááá á©ááá£áááá áá 
áá§ááááá¡ áááááááááá "
+"áá áá¥á¡áá¡ áá ááá¢áá®áá áááááá£á¢áá 
ááá¡, áááá ááá¢áá ááá¢á¨á."
 
 #: https//support.torproject.org/abuse/tor-ban-irc/
 #: (content/abuse/irc-ban/contents+en.lrquestion.description)
@@ -11643,7 +11652,7 @@ msgstr ""
 #: https//support.torproject.org/abuse/tor-ban-irc/
 #: (content/abuse/irc-ban/contents+en.lrquestion.description)
 msgid "The Tor network is just a drop in the bucket here."
-msgstr ""
+msgstr "Tor-á¥á¡ááá áá¥ áá¦ááá¨á á¬ááááá 
á£áá áááá."
 
 #: https//support.torproject.org/abuse/tor-ban-irc/
 #: (content/abuse/irc-ban/contents+en.lrquestion.description)

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

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2020-07-07 Thread translation

commit 8b1c39f99671c4615dc9e5c09f5b43e59ef48e8d
Author: Translation commit bot 
Date:   Tue Jul 7 22:17:42 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+ka.po | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/contents+ka.po b/contents+ka.po
index b38268fcf1..436c2d14aa 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -11533,7 +11533,7 @@ msgid ""
 "share of jerks."
 msgstr ""
 "á áá¡ááááá ááááá, á áááá áª ááá 
ááá áááááªáááááá¡ áááªáááá 
ááááá áá£áá á¥á¡ááá, ááááááá¡ "
-"áááá  á¡á£áááá¡ááª."
+"áááá  á¡á£ááá ááááááááá¡ááª."
 
 #: https//support.torproject.org/abuse/does-tor-get-much-abuse/
 #: (content/abuse/how-much-abuse/contents+en.lrquestion.description)
@@ -11589,16 +11589,20 @@ msgid ""
 "tool](https://exonerator.torproject.org/) to query the historic Tor relay "
 "lists and get an answer."
 msgstr ""
+"áá£ áá¡á£á á áááááááá¬ááá, 
áªááááá£áá IP-ááá¡áááá áá áá§á áá£ á á 
Tor-áá¡ áááá¡ááááá "
+"á¬áá á¢ááá áá ááá¡ áááá¡ááá¦áá á£á 
ááááááááá¨á, á¨áááá«ááá 
áááááá§áááá [ExoneraTor-"
+"á®ááá¡áá¬á§á](https://exonerator.torproject.org/) 
Tor-ááááááªáááááá¡ á©ááááááááááá¡ "
+"ááá¡áá¦áááá áá¡á¢áá ááááá."
 
 #: https//support.torproject.org/abuse/tor-ban-irc/
 #: (content/abuse/irc-ban/contents+en.lrquestion.title)
 msgid "Tor is banned from the IRC network I want to use."
-msgstr ""
+msgstr "Tor ááá á«ááá£ááá áá IRC-á¥á¡ááá¨á, á 
ááááá¡ ááááá§ááááááª áá¡á£á á¡."
 
 #: https//support.torproject.org/abuse/tor-ban-irc/
 #: (content/abuse/irc-ban/contents+en.lrquestion.description)
 msgid "Sometimes jerks make use of Tor to troll IRC channels."
-msgstr ""
+msgstr "áááá¯áá , ááááá á®ááá®á 
áá§ááááá¡ Tor-á¡ IRC-áá á®áááá¡ ááá¡áá¢á 
áááá."
 
 #: https//support.torproject.org/abuse/tor-ban-irc/
 #: (content/abuse/irc-ban/contents+en.lrquestion.description)

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

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2020-07-07 Thread translation

commit 1b71099e7db80ee4c0e21048c7c5152e98912393
Author: Translation commit bot 
Date:   Tue Jul 7 20:47:53 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+ka.po | 17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/contents+ka.po b/contents+ka.po
index 13d19ef768..b38268fcf1 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -11511,12 +11511,12 @@ msgstr ""
 #: https//support.torproject.org/abuse/does-tor-get-much-abuse/
 #: (content/abuse/how-much-abuse/contents+en.lrquestion.title)
 msgid "Does Tor get much abuse?"
-msgstr ""
+msgstr "áááá  á¡áá©áááá á¡ áá¦ááá¡ Tor?"
 
 #: https//support.torproject.org/abuse/does-tor-get-much-abuse/
 #: (content/abuse/how-much-abuse/contents+en.lrquestion.description)
 msgid "Not much, in the grand scheme of things."
-msgstr ""
+msgstr "áá áª áá¡á, á§ááááá¤á áá¡ 
áááááááá¡á¬áááááá."
 
 #: https//support.torproject.org/abuse/does-tor-get-much-abuse/
 #: (content/abuse/how-much-abuse/contents+en.lrquestion.description)
@@ -11524,6 +11524,7 @@ msgid ""
 "The network has been running since October 2003, and it's only generated a "
 "handful of complaints."
 msgstr ""
+"á¥á¡ááá ááá¨áááá£ááá 2003 á¬ááá¡ 
áá¥á¢áááá áááá áá á«ááááá áªáá¢á 
á¡áá©áááá á ááá£áá áááá."
 
 #: https//support.torproject.org/abuse/does-tor-get-much-abuse/
 #: (content/abuse/how-much-abuse/contents+en.lrquestion.description)
@@ -11531,6 +11532,8 @@ msgid ""
 "Of course, like all privacy-oriented networks on the net, it attracts its "
 "share of jerks."
 msgstr ""
+"á áá¡ááááá ááááá, á áááá áª ááá 
ááá áááááªáááááá¡ áááªáááá 
ááááá áá£áá á¥á¡ááá, ááááááá¡ "
+"áááá  á¡á£áááá¡ááª."
 
 #: https//support.torproject.org/abuse/does-tor-get-much-abuse/
 #: (content/abuse/how-much-abuse/contents+en.lrquestion.description)
@@ -11540,6 +11543,11 @@ msgid ""
 "complaints,\" so we hope our network is more sustainable than past attempts "
 "at anonymity networks."
 msgstr ""
+"Tor-áá¡ áááá¡ááááá á¬áá á¢áááá¡ 
áááá£ááááááá á£ááá á®áááá 
ááááá¯ááá âá áá¡á£á á¡áááá¡ "
+"á¥á¡áááá¡áááá¡ á¨áááá¬áá ááá¡ áá¡á£á 
áááááâ áá âáááá¡áááá á¬áá á¢áááá 
á¡áá©ááá áááá¡ "
+"ááááá¬á§ááá¢áá¡ áá¡á£á áááááâ 
áááááááááááá¡, áá¡á á áá áá¤áá¥á 
ááá, á©áááá á¥á¡ááá á£á¤á á "
+"áááá áááá, áááá á ááá áá£áá 
ááªáááááááá, áááááááá¡ 
áááá®áááá¡ááá áááªá£áá á¥á¡áááááá¡ "
+"á¨áá¥áááá¡."
 
 #: https//support.torproject.org/abuse/does-tor-get-much-abuse/
 #: (content/abuse/how-much-abuse/contents+en.lrquestion.description)
@@ -11567,6 +11575,11 @@ msgid ""
 "directory](https://blog.torproject.org/blog/start-tor-legal-support-;
 "directory) of people who may be able to help you."
 msgstr ""
+"ááá®ááá, áá®áááá [á¡áááá ááááá 
ááá á®.á.á.  á¨áááááááá EFF-áá¡ á¡áááá 
áááááªáááááááá¡ "
+"áááá 
](https://community.torproject.org/relay/community-resources/eff-tor-;
+"legal-faq/). áá¡ááá ááááªáááá áááá á 
[áªááááá á¡](https://blog.torproject.org/blog;
+"/start-tor-legal-support-directory) áá á®ááá®áá¡á, á 
áááááááª á¨áá£á«áááá ááááá®ááá áá"
+" á¡áááá áááá¬áá áááááá¡ 
á¡ááááá®ááá¨á."
 
 #: https//support.torproject.org/abuse/tor-ip-for-legal-case/
 #: (content/abuse/ip-legal-case/contents+en.lrquestion.description)

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

[tor-commits] [tpo/master] Add new Tor Browser version 9.5.2

2020-07-07 Thread sysrqb

commit 2f4fcc8b495235fadb5ae567e19d5e9d332a16e1
Author: Matthew Finkel 
Date:   Tue Jul 7 15:54:51 2020 +

Add new Tor Browser version 9.5.2
---
 databags/versions.ini   | 3 +++
 templates/download-android.html | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/databags/versions.ini b/databags/versions.ini
index 65455ff4..c9dc1d39 100644
--- a/databags/versions.ini
+++ b/databags/versions.ini
@@ -2,6 +2,9 @@
 version = 9.5.1
 win32 = 0.4.3.5
 
+[torbrowser-android-stable]
+version = 9.5.2
+
 [torbrowser-alpha]
 version = 10.0a2
 
diff --git a/templates/download-android.html b/templates/download-android.html
index d9aeab80..c95bab0b 100644
--- a/templates/download-android.html
+++ b/templates/download-android.html
@@ -16,7 +16,7 @@
   
   
 
-  {% set t = bag('versions', 'torbrowser-stable') %}
+  {% set t = bag('versions', 'torbrowser-android-stable') %}
   https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ 
t.version }}-android-aarch64-multi.apk">{{ _('Download .apk') }}  aarch64
   https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ 
t.version }}-android-aarch64-multi.apk.asc">{{ _('Sig') }}
 

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

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2020-07-07 Thread translation

commit 5769a58ebbdd20b576e33bf0332bf8e7edd7d6ff
Author: Translation commit bot 
Date:   Tue Jul 7 17:16:23 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 ka.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ka.po b/ka.po
index ffc50047dc..e90c65e2f6 100644
--- a/ka.po
+++ b/ka.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 19:37+0200\n"
-"PO-Revision-Date: 2020-07-07 16:43+\n"
+"PO-Revision-Date: 2020-07-07 17:02+\n"
 "Last-Translator: Georgianization\n"
 "Language-Team: Georgian 
(http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2020-07-07 Thread translation

commit f8c56d27404a8e7b30f55a6dd9ec962be9fb732f
Author: Translation commit bot 
Date:   Tue Jul 7 17:15:45 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 ka.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ka.po b/ka.po
index af827a0429..1ef16994bb 100644
--- a/ka.po
+++ b/ka.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 19:37+0200\n"
-"PO-Revision-Date: 2020-07-07 16:43+\n"
+"PO-Revision-Date: 2020-07-07 17:02+\n"
 "Last-Translator: Georgianization\n"
 "Language-Team: Georgian 
(http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -1626,7 +1626,7 @@ msgid ""
 "A captive portal is a web page that is displayed before you can access the 
Internet. Captive portals usually require to log in to the network or enter 
information such as an email address.\n"
 "\n"
 "The Unsafe Browser is not anonymous and can deanonymize you. Use it only to 
log in to captive portals."
-msgstr ""
+msgstr "ááá£áªáááá áá áá£ááá áá 
á¨áá¡áá«ááááááá ááá¨ááááá¡ áááá 
ááá á¨áá¡ááá.\n\nááá¨ááááá¡ áááá áá 
áá áá¡ ááááááá áá, á ááááááª 
áá®á¡áááá ááá¢áá ááá¢ááá á¬áááááá¡ 
ááá¦áááááá. ááá¨ááááá¡ áááá ááá 
á©ááá£áááá áá, ááá®áááá ááááá 
áá¨áá á¨áá¡áááá¡ áá á ááá 
áááááªáááá¡, ááááááááá 
ááá¤áá¡á¢áá¡ á¨áá§ááááá¡.\n\nááá£áªááá 
áá áá£ááá á¡ áá  á¨áá£á«ááá áááááááá¡ 
ááá¤áá áá áá á¨ááá«áááá áá¥áááá 
áááááªááááá áááááá¦ááááá¡. 
áááááá§áááá áá®áááá ááá¨ááááá¡ 
áááá áá
 ááá¡áááá¡."
 
 #: 
../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
 msgid "Disable the Unsafe Browser (default)"

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

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2020-07-07 Thread translation

commit a7a61155b60baa7245504130191af290a9c4c5f5
Author: Translation commit bot 
Date:   Tue Jul 7 16:46:21 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 ka.po | 4 ++--
 pl.po | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ka.po b/ka.po
index 90f11fb7d8..ffc50047dc 100644
--- a/ka.po
+++ b/ka.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 19:37+0200\n"
-"PO-Revision-Date: 2020-06-29 00:35+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2020-07-07 16:43+\n"
+"Last-Translator: Georgianization\n"
 "Language-Team: Georgian 
(http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/pl.po b/pl.po
index 904037894a..955a0d0259 100644
--- a/pl.po
+++ b/pl.po
@@ -15,6 +15,7 @@
 # Dawid Job , 2018
 # Dawid Job , 2014
 # Tomasz Ciborski , 2015-2016
+# Jan Kowalski , 2020
 # Konrad Wila <360...@gmail.com>, 2019
 # Marcin S , 2018
 # oirpos , 2015
@@ -27,8 +28,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 19:37+0200\n"
-"PO-Revision-Date: 2020-07-05 15:19+\n"
-"Last-Translator: Waldemar Stoczkowski\n"
+"PO-Revision-Date: 2020-07-07 16:42+\n"
+"Last-Translator: Jan Kowalski \n"
 "Language-Team: Polish 
(http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2020-07-07 Thread translation

commit cab17c2f6af518d1d67943c0900bb3f3a462801e
Author: Translation commit bot 
Date:   Tue Jul 7 16:45:44 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 ka.po | 22 +++---
 pl.po | 13 +++--
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/ka.po b/ka.po
index 5b2f8d6d18..af827a0429 100644
--- a/ka.po
+++ b/ka.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 19:37+0200\n"
-"PO-Revision-Date: 2020-06-29 00:35+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2020-07-07 16:43+\n"
+"Last-Translator: Georgianization\n"
 "Language-Team: Georgian 
(http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -404,15 +404,15 @@ msgstr "áááá¨áá ááá áá¨á"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
 msgid "_Unsafe Browser"
-msgstr ""
+msgstr "_ááá£áªáááá áá áá£ááá á"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
 msgid "Enabled"
-msgstr "á©áá áá£ááá"
+msgstr "á©áá áá£áá"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
 msgid "Disabled (default)"
-msgstr ""
+msgstr "ááááá áá£áá (áááá£ááá¡á®áááá)"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
 msgid "On (default)"
@@ -657,11 +657,11 @@ msgstr "áá£ááááá ááá®á¡ááá 
áááá¡ á¡áá¥áá¦
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
 msgid "Settings on the Welcome Screen"
-msgstr ""
+msgstr "ááá áááá¢á ááá ááá¡ááááááá¡ 
ááá áááá"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
 msgid "Language, administration password, and additional settings"
-msgstr ""
+msgstr "ááá, ááá áááá¡ ááá ááá áá 
ááááá¢ááááá ááá áááá¢á ááá"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
 msgid "Browser Bookmarks"
@@ -1436,7 +1436,7 @@ msgid ""
 "The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
 "to use the Unsafe Browser, you have to restart Tails and enable it in the "
 "settings on the Welcome Screen."
-msgstr ""
+msgstr "ááá£áªáááá áá áá£ááá á ááá  
á©ááá áá ááá¡ááááááá¡ ááá 
áááá.\\n\\náá£ áá¡á£á á áááááá§áááá 
ááá£áªáááá áá áá£ááá á, á®áááá®áá 
á£ááá ááá£á¨ááá Tails áá ááá áááá¢á 
áááááá á©áá ááá ááá¡ááááááá¡ ááá 
áááá."
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
@@ -1630,15 +1630,15 @@ msgstr ""
 
 #: 
../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
 msgid "Disable the Unsafe Browser (default)"
-msgstr ""
+msgstr "ááááá ááá ááá£áªáááá áá áá£ááá 
áá¡ (áááá£ááá¡á®áááá)"
 
 #: 
../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
 msgid "Enable the Unsafe Browser"
-msgstr ""
+msgstr "á©áá ááá ááá£áªáááá áá áá£ááá 
áá¡"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
 msgid "Settings were loaded from the persistent storage."
-msgstr ""
+msgstr "ááá áááá¢á ááá á©ááá¢ááá áá 
áá£ááááá ááá®á¡ááá áááááá."
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
diff --git a/pl.po b/pl.po
index ca9a1bef6a..00b409642d 100644
--- a/pl.po
+++ b/pl.po
@@ -15,6 +15,7 @@
 # Dawid Job , 2018
 # Dawid Job , 2014
 # Tomasz Ciborski , 2015-2016
+# Jan Kowalski , 2020
 # Konrad Wila <360...@gmail.com>, 2019
 # Marcin S , 2018
 # oirpos , 2015
@@ -27,8 +28,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 19:37+0200\n"
-"PO-Revision-Date: 2020-07-05 15:19+\n"
-"Last-Translator: Waldemar Stoczkowski\n"
+"PO-Revision-Date: 2020-07-07 16:42+\n"
+"Last-Translator: Jan Kowalski \n"
 "Language-Team: Polish 
(http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -874,10 +875,10 @@ msgstr "Nie udaÅo siÄ zaimportowaÄ kluczy z 
{path}:\n{error}"
 #:

[tor-commits] [bridgedb/develop] Remove coverage and pypi link; update Travis CI.

2020-07-07 Thread phw

commit c2f4661aa40399efa2d6a596a219cabbd73acae8
Author: Philipp Winter 
Date:   Tue Jul 7 09:19:01 2020 -0700

Remove coverage and pypi link; update Travis CI.

Our Travis CI link still pointed to sysrqb's profile.  This commit
updates the link to use phw's profile.  I'm also removing the (outdated)
pypi and coverage links.

This fixes tpo/anti-censorship/bridgedb#40002.
---
 README.rst | 16 +---
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/README.rst b/README.rst
index 51eff40..a06c2cd 100644
--- a/README.rst
+++ b/README.rst
@@ -1,20 +1,14 @@
-**
-BridgeDB |Latest Version| |Build Status| |Coverage Status|
-**
+***
+BridgeDB |Build Status|
+***
 
 BridgeDB is a collection of backend servers used to distribute `Tor Bridges
 `__. Currently, it mainly consists of
 a webserver with `an HTTPS interface `__,
 `an email responder `__, and an SQLite database.
 
-.. |Latest Version| image:: 
https://pypip.in/version/bridgedb/badge.svg?style=flat
-   :target: https://pypi.python.org/pypi/bridgedb/
-.. |Build Status| image:: https://travis-ci.org/sysrqbci/bridgedb.svg
-   :target: https://travis-ci.org/sysrqbci/bridgedb
-.. |Coverage Status| image:: 
https://coveralls.io/repos/github/sysrqbci/bridgedb/badge.svg?branch=develop
-   :target: https://coveralls.io/github/sysrqbci/bridgedb?branch=develop
-
-
+.. |Build Status| image:: 
https://travis-ci.org/NullHypothesis/bridgedb.svg?branch=master
+   :target: https://travis-ci.org/github/NullHypothesis/bridgedb
 
 .. image:: doc/sphinx/source/_static/bay-bridge.jpg
:scale: 80%



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

[tor-commits] [bridgedb/develop] Merge branch 'bug/40002' into 'develop'

2020-07-07 Thread phw

commit d8b73ecd65664bf60f61a72b3fb4e233663a6bee
Merge: 387f2b4 c2f4661
Author: Philipp Winter 
Date:   Tue Jul 7 16:21:07 2020 +

Merge branch 'bug/40002' into 'develop'

Remove coverage and pypi link; update Travis CI.

See merge request tpo/anti-censorship/bridgedb!6

 README.rst | 16 +---
 1 file changed, 5 insertions(+), 11 deletions(-)

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

[tor-commits] [bridgedb/develop] Remove the --reload command line switch.

2020-07-07 Thread phw

commit 2351f8652bb99b908c36957edee1585319ff6fcb
Author: Philipp Winter 
Date:   Thu Jul 2 10:53:28 2020 -0700

Remove the --reload command line switch.

This fixes tpo/anti-censorship/bridgedb#40001.
---
 CHANGELOG | 3 +++
 README.rst| 4 
 bridgedb/parse/options.py | 2 --
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c712436..0351de7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+* FIXES 
https://gitlab.torproject.org/tpo/anti-censorship/bridgedb/-/issues/40001
+Remove the --reload command line switch.  It doesn't actually do anything.
+
 * FIXES https://bugs.torproject.org/29184
 Add a new configuration option, BLACKLISTED_TOR_VERSIONS, which contains a
 list of Tor versions.  BridgeDB won't hand out bridges whose Tor version
diff --git a/README.rst b/README.rst
index 1b0a840..51eff40 100644
--- a/README.rst
+++ b/README.rst
@@ -318,10 +318,6 @@ Reloading Bridges From Their Descriptor Files:
 When you have new lists of bridges from the Bridge Authority, replace
 the old files and do::
 
-  bridgedb --reload
-
-Or just give it a SIGHUP::
-
   kill -s SIGHUP `cat .../run/bridgedb.pid`
 
 
diff --git a/bridgedb/parse/options.py b/bridgedb/parse/options.py
index c32ada3..83c0984 100644
--- a/bridgedb/parse/options.py
+++ b/bridgedb/parse/options.py
@@ -290,8 +290,6 @@ class SIGUSR1Options(BaseOptions):
 class MainOptions(BaseOptions):
 """Main commandline options parser for BridgeDB."""
 
-optFlags = [
-['reload', 'R', 'Reload bridge descriptors into running servers']]
 subCommands = [
 ['mock', None, MockOptions, "Generate a testing environment"],
 ['SIGHUP', None, SIGHUPOptions,



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

[tor-commits] [bridgedb/develop] Merge branch 'bug/40001' into 'develop'

2020-07-07 Thread phw

commit 387f2b403abf5ad1a4bec8f8132de5589ecdde23
Merge: 28c5479 2351f86
Author: Philipp Winter 
Date:   Tue Jul 7 16:02:06 2020 +

Merge branch 'bug/40001' into 'develop'

Remove the --reload command line switch.

See merge request tpo/anti-censorship/bridgedb!4

 CHANGELOG | 3 +++
 README.rst| 4 
 bridgedb/parse/options.py | 2 --
 3 files changed, 3 insertions(+), 6 deletions(-)

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

[tor-commits] [chutney/master] TorNet: simplify print_bootstrap_status

2020-07-07 Thread nickm

commit 6dd12614944770c11f6a17c00c4abb5e0177d362
Author: c 
Date:   Sun May 17 04:20:15 2020 +

TorNet: simplify print_bootstrap_status

In order to simplify code while preserving atomicity of bootstrap status
between calls of getBootstrapStatus, introduce a new function,
updateBootstrapStatus, which stores last status in the
LocalNodeController object. That way, subsequent calls to
getBootstrapStatus are guaranteed to be same until next update, and we
have fewer lists to create and zip, fewer arguments to pass to
print_bootstrap_status, and hopefully easier code to reason about.
---
 lib/chutney/TorNet.py | 33 -
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index d9b1254..7d69eed 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -851,6 +851,7 @@ class LocalNodeController(NodeController):
 def __init__(self, env):
 NodeController.__init__(self, env)
 self._env = env
+self.most_recent_bootstrap_status = None
 
 def getNick(self):
 """Return the nickname for this node."""
@@ -1189,10 +1190,9 @@ class LocalNodeController(NodeController):
 break
 return (percent, keyword, message)
 
-def getLastBootstrapStatus(self):
-"""Look through the logs and return the last bootstrap message
-   received as a 3-tuple of percentage complete, keyword
-   (optional), and message.
+def updateLastBootstrapStatus(self):
+"""Look through the logs and cache the last bootstrap message
+   received.
 """
 logfname = self.getLogfile()
 if not os.path.exists(logfname):
@@ -1208,7 +1208,14 @@ class LocalNodeController(NodeController):
 if m:
 percent, keyword, message = m.groups()
 percent = int(percent)
-return (percent, keyword, message)
+self.most_recent_bootstrap_status = (percent, keyword, message)
+
+def getLastBootstrapStatus(self):
+"""Return the last bootstrap message fetched by
+   updateLastBootstrapStatus as a 3-tuple of percentage
+   complete, keyword (optional), and message.
+"""
+return self.most_recent_bootstrap_status
 
 def isBootstrapped(self):
 """Return true iff the logfile says that this instance is
@@ -2185,7 +2192,6 @@ class Network(object):
 
 def print_bootstrap_status(self,
controllers,
-   most_recent_bootstrap_status,
most_recent_desc_status,
elapsed=None,
msg="Bootstrap in progress"):
@@ -2198,13 +2204,13 @@ class Network(object):
 header = "{}{}".format(msg, elapsed_msg)
 print(header)
 print("Node status:")
-for c, boot_status in zip(controllers, most_recent_bootstrap_status):
+for c in controllers:
 c.check(listRunning=False, listNonRunning=True)
 nick = c.getNick()
 nick_set.add(nick)
 if c.getConsensusAuthority():
 cons_auth_nick_set.add(nick)
-pct, kwd, bmsg = boot_status
+pct, kwd, bmsg = c.getLastBootstrapStatus()
 # Support older tor versions without bootstrap keywords
 if not kwd:
 kwd = "None"
@@ -2268,14 +2274,12 @@ class Network(object):
 
 while True:
 all_bootstrapped = True
-most_recent_bootstrap_status = [ ]
 most_recent_desc_status = dict()
 for c in controllers:
 nick = c.getNick()
-pct, kwd, bmsg = c.getLastBootstrapStatus()
-most_recent_bootstrap_status.append((pct, kwd, bmsg))
+c.updateLastBootstrapStatus()
 
-if pct != LocalNodeController.SUCCESS_CODE:
+if not c.isBootstrapped():
 all_bootstrapped = False
 
 desc_status = c.getNodeDirInfoStatus()
@@ -2294,7 +2298,6 @@ class Network(object):
 print("Everything bootstrapped after {} sec"
   .format(int(elapsed)))
 self.print_bootstrap_status(controllers,
-most_recent_bootstrap_status,
 most_recent_desc_status,
 elapsed=elapsed,
 msg="Bootstrap finished")
@@ -2332,7 +2335,6 @@ class Network(object):
 if now >= next_print_status:
 if checks_since_last_print <= Network.CHECKS_PER_PRINT/2:
 self.print_bootstrap_status(controllers,
-most_recent_bootstrap_status,

[tor-commits] [chutney/master] TorNet: clarify to run updateLastStatus() first

2020-07-07 Thread nickm

commit f43449e53d0f798c9f62d5507145ec9956b17ffd
Author: c 
Date:   Thu May 21 08:01:31 2020 +

TorNet: clarify to run updateLastStatus() first

Clarify in getLast*() and isBoostrapped() function documentation that
updateLastStatus() affects these functions and must be called first.
---
 lib/chutney/TorNet.py | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index 76512ab..6f71963 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -1194,6 +1194,9 @@ class LocalNodeController(NodeController):
 """Return the last onion descriptor message fetched by
updateLastOnionServiceDescStatus as a 3-tuple of percentage
complete, the hidden service version, and message.
+
+   The return status depends on the last time updateLastStatus()
+   was called; that function must be called before this one.
 """
 return self.most_recent_oniondesc_status
 
@@ -1221,6 +1224,9 @@ class LocalNodeController(NodeController):
 """Return the last bootstrap message fetched by
updateLastBootstrapStatus as a 3-tuple of percentage
complete, keyword (optional), and message.
+
+   The return status depends on the last time updateLastStatus()
+   was called; that function must be called before this one.
 """
 return self.most_recent_bootstrap_status
 
@@ -1233,7 +1239,11 @@ class LocalNodeController(NodeController):
 
 def isBootstrapped(self):
 """Return true iff the logfile says that this instance is
-   bootstrapped."""
+   bootstrapped.
+
+   The return status depends on the last time updateLastStatus()
+   was called; that function must be called before this one.
+"""
 pct, _, _ = self.getLastBootstrapStatus()
 if pct != LocalNodeController.SUCCESS_CODE:
 return False



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

[tor-commits] [chutney/master] Merge remote-tracking branch 'tor-github/pr/66'

2020-07-07 Thread nickm

commit 99bd06c7554b9113af8c0877b6eca4ceb95dcbaa
Merge: bc6015c f43449e
Author: Nick Mathewson 
Date:   Tue Jul 7 11:12:41 2020 -0400

Merge remote-tracking branch 'tor-github/pr/66'

 lib/chutney/TorNet.py | 107 +++---
 1 file changed, 84 insertions(+), 23 deletions(-)

diff --cc lib/chutney/TorNet.py
index 98ccc45,6f71963..37bef04
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@@ -869,51 -851,9 +869,53 @@@ class LocalNodeController(NodeControlle
  def __init__(self, env):
  NodeController.__init__(self, env)
  self._env = env
+ self.most_recent_oniondesc_status = None
+ self.most_recent_bootstrap_status = None
  
 +def _loadEd25519Id(self):
 +"""
 +   Read the ed25519 identity key for this router, encode it using
 +   base64, strip trailing padding, and return it.
 +
 +   If the file does not exist, returns None.
 +
 +   Raises a ValueError if the file appears to be corrupt.
 +"""
 +datadir = self._env['dir']
 +key_file = os.path.join(datadir, 'keys',
 +"ed25519_master_id_public_key")
 +# If we're called early during bootstrap, the file won't have been
 +# created yet. (And some very old tor versions don't have ed25519.)
 +if not os.path.exists(key_file):
 +debug(("File {} does not exist. Are you running a very old tor "
 +   "version?").format(key_file))
 +return None
 +
 +EXPECTED_ED25519_FILE_SIZE = 64
 +key_file_size = os.stat(key_file).st_size
 +if key_file_size != EXPECTED_ED25519_FILE_SIZE:
 +raise ValueError(
 +("The current size of the file is {} bytes, which is not"
 + "matching the expected value of {} bytes")
 +.format(key_file_size, EXPECTED_ED25519_FILE_SIZE))
 +
 +with open(key_file, 'rb') as f:
 +ED25519_KEY_POSITION = 32
 +f.seek(ED25519_KEY_POSITION)
 +rest_file = f.read()
 +encoded_value = base64.b64encode(rest_file)
 +# tor strips trailing base64 padding
 +ed25519_id = encoded_value.decode('utf-8').replace('=', '')
 +EXPECTED_ED25519_BASE64_KEY_SIZE = 43
 +key_base64_size = len(ed25519_id)
 +if (key_base64_size != EXPECTED_ED25519_BASE64_KEY_SIZE):
 +raise ValueError(
 +("The current length of the key is {}, which is not "
 + "matching the expected length of {}")
 +.format(key_base64_size,
 +EXPECTED_ED25519_BASE64_KEY_SIZE))
 +return ed25519_id
 +
  def getNick(self):
  """Return the nickname for this node."""
  return self._env['nick']
@@@ -1045,23 -958,19 +1047,23 @@@
  """Returns the amount of time to wait before verifying, after the
 network has bootstrapped, and the dir info has been distributed.
  
 -   Based on whether this node is an onion service.
 +   Based on whether this node has unchecked directory info, or other
 +   known timing issues.
  """
- if self.getOnionService():
+ if self.isOnionService():
  return LocalNodeController.HS_WAIT_FOR_UNCHECKED_DIR_INFO
 +elif self.getBridge():
 +return LocalNodeController.BRIDGE_WAIT_FOR_UNCHECKED_DIR_INFO
 +elif self.isLegacyTorVersion():
 +return LocalNodeController.LEGACY_WAIT_FOR_UNCHECKED_DIR_INFO
  else:
 -return LocalNodeController.NODE_WAIT_FOR_UNCHECKED_DIR_INFO
 +return LocalNodeController.DEFAULT_WAIT_FOR_UNCHECKED_DIR_INFO
  
  def getPid(self):
 -"""Assuming that this node has its pidfile in ${dir}/pid, return
 -   the pid of the running process, or None if there is no pid in the
 -   file.
 +"""Read the pidfile, and return the pid of the running process.
 +   Returns None if there is no pid in the file.
  """
 -pidfile = os.path.join(self._env['dir'], 'pid')
 +pidfile = self._env['pidfile']
  if not os.path.exists(pidfile):
  return None
  

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

[tor-commits] [chutney/master] TorNet: rename getOnionService to isOnionService

2020-07-07 Thread nickm

commit be0e53aeb0ad63a41644cf5690472f4a5838
Author: c 
Date:   Sun May 17 04:34:13 2020 +

TorNet: rename getOnionService to isOnionService

Function returns boolean so make its name clearer
---
 lib/chutney/TorNet.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index 953d7f5..4bd926f 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -908,7 +908,7 @@ class LocalNodeController(NodeController):
 """
 return self.getDirServer() and not self.getBridge()
 
-def getOnionService(self):
+def isOnionService(self):
 """Is this node an onion service?"""
 if self._env['tag'].startswith('h'):
 return 1
@@ -959,7 +959,7 @@ class LocalNodeController(NodeController):
 
Based on whether this node is an onion service.
 """
-if self.getOnionService():
+if self.isOnionService():
 return LocalNodeController.HS_WAIT_FOR_UNCHECKED_DIR_INFO
 else:
 return LocalNodeController.NODE_WAIT_FOR_UNCHECKED_DIR_INFO
@@ -1221,9 +1221,9 @@ class LocalNodeController(NodeController):
 """Return true iff the logfile says that this instance is
bootstrapped."""
 pct, _, _ = self.getLastBootstrapStatus()
-if self.getOnionService():
 if pct != LocalNodeController.SUCCESS_CODE:
 return False
+if self.isOnionService():
 pct, _, _ = self.getLastOnionServiceDescStatus()
 if pct != LocalNodeController.ONIONDESC_PUBLISHED_CODE:
 return False



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

[tor-commits] [chutney/master] TorNet: add getLastOnionServiceDescStatus()

2020-07-07 Thread nickm

commit 70cd3c3943244f10ea54de949434db5b8049aa2f
Author: c 
Date:   Sun Apr 5 09:30:50 2020 +

TorNet: add getLastOnionServiceDescStatus()

Use this function to check info logs for uploads of onion descriptors.
---
 lib/chutney/TorNet.py | 34 ++
 1 file changed, 34 insertions(+)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index b2fde0c..db7845e 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -1154,6 +1154,40 @@ class LocalNodeController(NodeController):
 SHORT_FILE_CODE = -100
 NO_PROGRESS_CODE = 0
 SUCCESS_CODE = 100
+ONIONDESC_PUBLISHED_CODE = 200
+HSV2_KEYWORD = "hidden service v2"
+HSV3_KEYWORD = "hidden service v3"
+
+def getLastOnionServiceDescStatus(self):
+"""Look through info-level logs for onion service descriptor uploads
+   and return a 3-tuple of percentage complete, the hidden service
+   version, and message.
+"""
+logfname = self.getLogfile(info=True)
+if not os.path.exists(logfname):
+return (LocalNodeController.MISSING_FILE_CODE,
+"no_logfile", "There is no logfile yet.")
+percent = LocalNodeController.NO_RECORDS_CODE
+keyword = "no_message"
+message = "No onion service descriptor messages yet."
+with open(logfname, 'r') as f:
+for line in f:
+m_v2 = re.search(r'Launching upload for hidden service (.*)',
+ line)
+if m_v2:
+percent = LocalNodeController.ONIONDESC_PUBLISHED_CODE
+keyword = LocalNodeController.HSV2_KEYWORD
+message = m_v2.groups()[0]
+break
+# else
+m_v3 = re.search(r'Service ([^\s]+ [^\s]+ descriptor of 
revision .*)',
+ line)
+if m_v3:
+percent = LocalNodeController.ONIONDESC_PUBLISHED_CODE
+keyword = LocalNodeController.HSV3_KEYWORD
+message = m_v3.groups()[0]
+break
+return (percent, keyword, message)
 
 def getLastBootstrapStatus(self):
 """Look through the logs and return the last bootstrap message



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

[tor-commits] [chutney/master] TorNet: document updateLastOnionServiceDescStatus

2020-07-07 Thread nickm

commit 3635be7b0186cd7ca340a965bae7098237a07e01
Author: c 
Date:   Thu May 21 07:52:24 2020 +

TorNet: document updateLastOnionServiceDescStatus

Update updateLastOnionServiceDescStatus and
getLastOnionServiceDescStatus docstrings
---
 lib/chutney/TorNet.py | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index b211fc2..76512ab 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -1161,6 +1161,9 @@ class LocalNodeController(NodeController):
 HSV3_KEYWORD = "hidden service v3"
 
 def updateLastOnionServiceDescStatus(self):
+"""Look through the logs and cache the last onion service
+   descriptor status received.
+"""
 logfname = self.getLogfile(info=True)
 if not os.path.exists(logfname):
 return (LocalNodeController.MISSING_FILE_CODE,
@@ -1188,9 +1191,9 @@ class LocalNodeController(NodeController):
 self.most_recent_oniondesc_status = (percent, keyword, message)
 
 def getLastOnionServiceDescStatus(self):
-"""Look through info-level logs for onion service descriptor uploads
-   and return a 3-tuple of percentage complete, the hidden service
-   version, and message.
+"""Return the last onion descriptor message fetched by
+   updateLastOnionServiceDescStatus as a 3-tuple of percentage
+   complete, the hidden service version, and message.
 """
 return self.most_recent_oniondesc_status
 



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

[tor-commits] [chutney/master] TorNet: add and call updateLastStatus

2020-07-07 Thread nickm

commit 73db8ee08d67659a8a64dd3bba5656d81c0a3ae4
Author: c 
Date:   Sun May 17 04:43:21 2020 +

TorNet: add and call updateLastStatus

This will update node's status all at once (last onion descriptor status
received, last bootstrap status received). I still want to refactor most
recent descriptor status, stay tuned
---
 lib/chutney/TorNet.py | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index fa268d3..b211fc2 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -1221,6 +1221,13 @@ class LocalNodeController(NodeController):
 """
 return self.most_recent_bootstrap_status
 
+def updateLastStatus(self):
+"""Update last messages this node has received, for use with
+   isBootstrapped and the getLast* functions.
+"""
+self.updateLastOnionServiceDescStatus()
+self.updateLastBootstrapStatus()
+
 def isBootstrapped(self):
 """Return true iff the logfile says that this instance is
bootstrapped."""
@@ -2283,7 +2290,7 @@ class Network(object):
 most_recent_desc_status = dict()
 for c in controllers:
 nick = c.getNick()
-c.updateLastBootstrapStatus()
+c.updateLastStatus()
 
 if not c.isBootstrapped():
 all_bootstrapped = False



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

[tor-commits] [chutney/master] TorNet: correct getOnionService logic

2020-07-07 Thread nickm

commit f0055aa5baae865072ae9e06c8b92460c0ad43f3
Author: c 
Date:   Sun May 17 04:33:28 2020 +

TorNet: correct getOnionService logic

Pretty sure I messed up the logic for this function; in any case let's
be safe and write it more clearly
---
 lib/chutney/TorNet.py | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index 7d69eed..953d7f5 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -1222,10 +1222,12 @@ class LocalNodeController(NodeController):
bootstrapped."""
 pct, _, _ = self.getLastBootstrapStatus()
 if self.getOnionService():
-return pct == LocalNodeController.SUCCESS_CODE
-else:
+if pct != LocalNodeController.SUCCESS_CODE:
+return False
 pct, _, _ = self.getLastOnionServiceDescStatus()
-return pct == LocalNodeController.ONIONDESC_PUBLISHED_CODE
+if pct != LocalNodeController.ONIONDESC_PUBLISHED_CODE:
+return False
+return True
 
 # There are 7 v3 directory document types, but some networks only use 6,
 # because they don't have a bridge authority



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

[tor-commits] [chutney/master] TorNet: Also check oniondesc in isBootstrapped()

2020-07-07 Thread nickm

commit 2b3cee08768b233029ce4db20014f258a5d1e27d
Author: c 
Date:   Sun Apr 5 11:16:04 2020 +

TorNet: Also check oniondesc in isBootstrapped()

Make isBootstrapped() check return both for getLastBootstrapStatus() and
getLastOnionServiceDescStatus() and return true iff both succeed.
---
 lib/chutney/TorNet.py | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index db7845e..7838a78 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -1214,7 +1214,12 @@ class LocalNodeController(NodeController):
 """Return true iff the logfile says that this instance is
bootstrapped."""
 pct, _, _ = self.getLastBootstrapStatus()
-return pct == LocalNodeController.SUCCESS_CODE
+if pct != LocalNodeController.SUCCESS_CODE:
+return False
+pct, _, _ = self.getLastOnionServiceDescStatus()
+if pct != LocalNodeController.ONIONDESC_PUBLISHED_CODE:
+return False
+return True
 
 # There are 7 v3 directory document types, but some networks only use 6,
 # because they don't have a bridge authority



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

[tor-commits] [chutney/master] TorNet: clarify getLastOnionServiceDescStatus comment

2020-07-07 Thread nickm

commit 33ca755b757409a3d0caab3489d2492da655fb37
Author: c 
Date:   Sun May 17 04:05:52 2020 +

TorNet: clarify getLastOnionServiceDescStatus comment
---
 lib/chutney/TorNet.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index b5eb186..16607c0 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -1179,7 +1179,7 @@ class LocalNodeController(NodeController):
 keyword = LocalNodeController.HSV2_KEYWORD
 message = m_v2.groups()[0]
 break
-# else
+# else check for HSv3
 m_v3 = re.search(r'Service ([^\s]+ [^\s]+ descriptor of 
revision .*)',
  line)
 if m_v3:



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

[tor-commits] [chutney/master] TorNet: add updateLastOnionServiceDescStatus

2020-07-07 Thread nickm

commit 0216ace00a12125896e0a77fec19adf75416d2f5
Author: c 
Date:   Sun May 17 04:42:16 2020 +

TorNet: add updateLastOnionServiceDescStatus

Like updateLastBootstrapStatus this should make the code cleaner
---
 lib/chutney/TorNet.py | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index 4bd926f..fa268d3 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -851,6 +851,7 @@ class LocalNodeController(NodeController):
 def __init__(self, env):
 NodeController.__init__(self, env)
 self._env = env
+self.most_recent_oniondesc_status = None
 self.most_recent_bootstrap_status = None
 
 def getNick(self):
@@ -1159,11 +1160,7 @@ class LocalNodeController(NodeController):
 HSV2_KEYWORD = "hidden service v2"
 HSV3_KEYWORD = "hidden service v3"
 
-def getLastOnionServiceDescStatus(self):
-"""Look through info-level logs for onion service descriptor uploads
-   and return a 3-tuple of percentage complete, the hidden service
-   version, and message.
-"""
+def updateLastOnionServiceDescStatus(self):
 logfname = self.getLogfile(info=True)
 if not os.path.exists(logfname):
 return (LocalNodeController.MISSING_FILE_CODE,
@@ -1188,7 +1185,14 @@ class LocalNodeController(NodeController):
 keyword = LocalNodeController.HSV3_KEYWORD
 message = m_v3.groups()[0]
 break
-return (percent, keyword, message)
+self.most_recent_oniondesc_status = (percent, keyword, message)
+
+def getLastOnionServiceDescStatus(self):
+"""Look through info-level logs for onion service descriptor uploads
+   and return a 3-tuple of percentage complete, the hidden service
+   version, and message.
+"""
+return self.most_recent_oniondesc_status
 
 def updateLastBootstrapStatus(self):
 """Look through the logs and cache the last bootstrap message



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

[tor-commits] [chutney/master] TorNet: get rid of useless assignments

2020-07-07 Thread nickm

commit 7ab564b5c99cdc2e64e696ab1af231bbc05a11ca
Author: c 
Date:   Sun May 17 04:10:26 2020 +

TorNet: get rid of useless assignments

most_recent_bootstrap_status and most_recent_desc_status are set first
thing within the while loop
---
 lib/chutney/TorNet.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index 16607c0..d9b1254 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -2266,8 +2266,6 @@ class Network(object):
 
 checks_since_last_print = 0
 
-most_recent_bootstrap_status = [ None ] * len(controllers)
-most_recent_desc_status = dict()
 while True:
 all_bootstrapped = True
 most_recent_bootstrap_status = [ ]



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

[tor-commits] [chutney/master] TorNet: Check oniondesc status iff node has onion

2020-07-07 Thread nickm

commit a0367ccc66d4a47758f7e9fb9463b3a597a24777
Author: c 
Date:   Thu Apr 9 13:17:18 2020 +

TorNet: Check oniondesc status iff node has onion

Modify isBootstrapped() only to check onion descriptor status for Tor
nodes that declared onion services. This builds off last commit
(2b3cee08) which erroneously checked *all* nodes for onion bootstrap
status.
---
 lib/chutney/TorNet.py | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index 7838a78..b5eb186 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -1214,12 +1214,11 @@ class LocalNodeController(NodeController):
 """Return true iff the logfile says that this instance is
bootstrapped."""
 pct, _, _ = self.getLastBootstrapStatus()
-if pct != LocalNodeController.SUCCESS_CODE:
-return False
-pct, _, _ = self.getLastOnionServiceDescStatus()
-if pct != LocalNodeController.ONIONDESC_PUBLISHED_CODE:
-return False
-return True
+if self.getOnionService():
+return pct == LocalNodeController.SUCCESS_CODE
+else:
+pct, _, _ = self.getLastOnionServiceDescStatus()
+return pct == LocalNodeController.ONIONDESC_PUBLISHED_CODE
 
 # There are 7 v3 directory document types, but some networks only use 6,
 # because they don't have a bridge authority



___
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 'tor-github/pr/1974/head'

2020-07-07 Thread nickm

commit 9e33391ebb01700d3f3f9cb29a6b74756559de4a
Merge: 640a777c9 118c35b55
Author: Nick Mathewson 
Date:   Tue Jul 7 11:08:20 2020 -0400

Merge remote-tracking branch 'tor-github/pr/1974/head'

 src/feature/hs/hs_service.c| 3 +++
 src/feature/rend/rendservice.c | 3 +++
 2 files changed, 6 insertions(+)

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

[tor-commits] [tor/master] Mark some log messages as used by Chutney.

2020-07-07 Thread nickm

commit 118c35b55bb7c6f03a6a39558a35ee754b58942a
Author: George Kadianakis 
Date:   Tue Jul 7 12:45:29 2020 +0300

Mark some log messages as used by Chutney.
---
 src/feature/hs/hs_service.c| 3 +++
 src/feature/rend/rendservice.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c
index 249eb47b5..995c1ca78 100644
--- a/src/feature/hs/hs_service.c
+++ b/src/feature/hs/hs_service.c
@@ -2874,6 +2874,9 @@ upload_descriptor_to_hsdir(const hs_service_t *service,
   hsdir->hsdir_index.store_first;
 char *blinded_pubkey_log_str =
   tor_strdup(hex_str((char*)>blinded_kp.pubkey.pubkey, 32));
+/* This log message is used by Chutney as part of its bootstrap
+ * detection mechanism. Please don't change without first checking
+ * Chutney. */
 log_info(LD_REND, "Service %s %s descriptor of revision %" PRIu64
   " initiated upload request to %s with index %s (%s)",
  safe_str_client(service->onion_address),
diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c
index 1c456cb6e..7f2db4314 100644
--- a/src/feature/rend/rendservice.c
+++ b/src/feature/rend/rendservice.c
@@ -3827,6 +3827,9 @@ upload_service_descriptor(rend_service_t *service)
   rend_get_service_id(service->desc->pk, serviceid);
   if (get_options()->PublishHidServDescriptors) {
 /* Post the current descriptors to the hidden service directories. */
+/* This log message is used by Chutney as part of its bootstrap
+ * detection mechanism. Please don't change without first checking
+ * Chutney. */
 log_info(LD_REND, "Launching upload for hidden service %s",
  serviceid);
 directory_post_to_hs_dir(service->desc, descs, NULL, serviceid,



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

[tor-commits] [tor/master] addr: Attempt to learn our address with ORPort

2020-07-07 Thread dgoulet

commit 809c8647079e3e84d401db25055144c5180aa75d
Author: David Goulet 
Date:   Mon Jul 6 11:09:39 2020 -0400

addr: Attempt to learn our address with ORPort

If no Address statement are found in the configuration file, attempt to 
learn
our address by looking at the ORPort address if any. Specifying an address 
is
optional so if we can't find one, it is fine, we move on to the next 
discovery
mechanism.

Note that specifying a hostname on the ORPort is not yet supported at this
commit.

Closes #33236

Signed-off-by: David Goulet 
---
 changes/ticket33236   |  4 ++
 src/app/config/resolve_addr.c | 58 
 src/app/config/resolve_addr.h |  6 +++
 src/test/test_config.c| 90 ++-
 4 files changed, 149 insertions(+), 9 deletions(-)

diff --git a/changes/ticket33236 b/changes/ticket33236
new file mode 100644
index 0..d2b1d7e4d
--- /dev/null
+++ b/changes/ticket33236
@@ -0,0 +1,4 @@
+  o Minor feature (relay, address discovery):
+- If Address is not found in torrc, attempt to learn our address with the
+  configured ORPort address if any. Closes ticket 33236.
+
diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c
index 808c5ddf0..caca5a37d 100644
--- a/src/app/config/resolve_addr.c
+++ b/src/app/config/resolve_addr.c
@@ -370,6 +370,63 @@ get_address_from_interface(const or_options_t *options, 
int warn_severity,
   return FN_RET_OK;
 }
 
+/** @brief Get IP address from the ORPort (if any).
+ *
+ * @param options Global configuration options.
+ * @param warn_severity Log level that should be used on error.
+ * @param family IP address family. Only AF_INET and AF_INET6 are supported.
+ * @param method_out OUT: Always "CONFIGURED_ORPORT" on success which is
+ *   detailed in the control-spec.txt as actions
+ *   for "STATUS_SERVER".
+ * @param hostname_out OUT: String containing the ORPort hostname if any.
+ * @param addr_out OUT: Tor address found if any.
+ *
+ * @return Return 0 on success that is an address has been found. Return
+ * error code ERR_* found at the top of the file.
+ */
+static fn_address_ret_t
+get_address_from_orport(const or_options_t *options, int warn_severity,
+int family, const char **method_out,
+char **hostname_out, tor_addr_t *addr_out)
+{
+  int ret;
+  const tor_addr_t *addr;
+
+  tor_assert(method_out);
+  tor_assert(hostname_out);
+  tor_assert(addr_out);
+
+  log_debug(LD_CONFIG, "Attempting to get address from ORPort");
+
+  if (!options->ORPort_set) {
+log_info(LD_CONFIG, "No ORPort found in configuration.");
+/* No ORPort statement, inform caller to try next method. */
+return FN_RET_NEXT;
+  }
+
+  /* Get ORPort for requested family. */
+  addr = get_orport_addr(family);
+  if (!addr) {
+/* No address configured for the ORPort. Ignore. */
+return FN_RET_NEXT;
+  }
+
+  /* We found the ORPort address. Just make sure it can be used. */
+  ret = address_can_be_used(addr, options, warn_severity, true);
+  if (ret < 0) {
+/* Unable to use address. Inform caller to try next method. */
+return FN_RET_NEXT;
+  }
+
+  /* Found it! */
+  *method_out = "CONFIGURED_ORPORT";
+  tor_addr_copy(addr_out, addr);
+
+  log_fn(warn_severity, LD_CONFIG, "Address found from ORPort: %s",
+ fmt_addr(addr_out));
+  return FN_RET_OK;
+}
+
 /** @brief Update the last resolved address cache using the given address.
  *
  * A log notice is emitted if the given address has changed from before. Not
@@ -450,6 +507,7 @@ static fn_address_ret_t
 {
   /* These functions are in order for our find address algorithm. */
   get_address_from_config,
+  get_address_from_orport,
   get_address_from_interface,
   get_address_from_hostname,
 };
diff --git a/src/app/config/resolve_addr.h b/src/app/config/resolve_addr.h
index 54f55ba36..e6f8a7255 100644
--- a/src/app/config/resolve_addr.h
+++ b/src/app/config/resolve_addr.h
@@ -9,8 +9,14 @@
 #ifndef TOR_CONFIG_RESOLVE_ADDR_H
 #define TOR_CONFIG_RESOLVE_ADDR_H
 
+#include "app/config/config.h"
+#include "core/mainloop/connection.h"
+
 #include "app/config/or_options_st.h"
 
+#define get_orport_addr(family) \
+  (get_first_advertised_addr_by_type_af(CONN_TYPE_OR_LISTENER, family))
+
 bool find_my_address(const or_options_t *options, int family,
  int warn_severity, tor_addr_t *addr_out,
  const char **method_out, char **hostname_out);
diff --git a/src/test/test_config.c b/src/test/test_config.c
index 765db03c0..0862ba5c4 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -1256,13 +1256,15 @@ get_interface_address6_failure(int severity, 
sa_family_t family,
 /** Helper macro: Cleanup the address and variables used after a
  * find_my_address() call. */
 #undef CLEANUP_FOUND_ADDRESS
-#define CLEANUP_FOUND_ADDRESS \
-  do {

[tor-commits] [tor/master] Merge branch 'ticket33236_045_01'

2020-07-07 Thread dgoulet

commit 640a777c9bf3b581dd951a9021aefe3f8dd9d3ce
Merge: aa80f73fc 809c86470
Author: David Goulet 
Date:   Tue Jul 7 11:01:26 2020 -0400

Merge branch 'ticket33236_045_01'

 changes/ticket33236   |  4 ++
 src/app/config/resolve_addr.c | 58 
 src/app/config/resolve_addr.h |  6 +++
 src/test/test_config.c| 90 ++-
 4 files changed, 149 insertions(+), 9 deletions(-)

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

[tor-commits] [torspec/master] control-spec: Add CONFIGURED_ORPORT to SERVER_STATUS event

2020-07-07 Thread dgoulet

commit 493f1524a12821dbf8ab0c23c08275816f4d31c8
Author: David Goulet 
Date:   Tue Jul 7 10:51:36 2020 -0400

control-spec: Add CONFIGURED_ORPORT to SERVER_STATUS event

A tor relay now can discover its address using the ORPort address if one is
specified.

For that reason, we add a new method to the SERVER_STATUS event that is
CONFIGURED_ORPORT in order to identify the configured address on the ORPort.

Related to #33236

Signed-off-by: David Goulet 
---
 control-spec.txt | 22 --
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/control-spec.txt b/control-spec.txt
index 77cc01c..0334639 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -2900,16 +2900,18 @@
  EXTERNAL_ADDRESS
  "ADDRESS=IP"
  "HOSTNAME=NAME"
- "METHOD=CONFIGURED/DIRSERV/RESOLVED/INTERFACE/GETHOSTNAME"
-   Our best idea for our externally visible IP has changed to 'IP'.
-   If 'HOSTNAME' is present, we got the new IP by resolving 'NAME'.  If the
-   method is 'CONFIGURED', the IP was given verbatim as a configuration
-   option.  If the method is 'RESOLVED', we resolved the Address
-   configuration option to get the IP.  If the method is 'GETHOSTNAME',
-   we resolved our hostname to get the IP.  If the method is 'INTERFACE',
-   we got the address of one of our network interfaces to get the IP.  If
-   the method is 'DIRSERV', a directory server told us a guess for what
-   our IP might be.
+ "METHOD=CONFIGURED/CONFIGURED_ORPORT/DIRSERV/RESOLVED/
+ INTERFACE/GETHOSTNAME"
+   Our best idea for our externally visible IP has changed to 'IP'.  If
+   'HOSTNAME' is present, we got the new IP by resolving 'NAME'.  If the
+   method is 'CONFIGURED', the IP was given verbatim as the Address
+   configuration option.  If the method is 'CONFIGURED_ORPORT', the IP was
+   given verbatim in the ORPort configuration option. If the method is
+   'RESOLVED', we resolved the Address configuration option to get the IP.
+   If the method is 'GETHOSTNAME', we resolved our hostname to get the IP.
+   If the method is 'INTERFACE', we got the address of one of our network
+   interfaces to get the IP.  If the method is 'DIRSERV', a directory
+   server told us a guess for what our IP might be.
 
{Controllers may want to record this info and display it to the user.}
 

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

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

2020-07-07 Thread ahf

commit dc45f0a8cbf86b1ea3d0c28b75a77297df7bf396
Merge: 084cc7f6f a213d2793
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jul 7 14:48:36 2020 +

Merge branch 'maint-0.4.3' into release-0.4.3

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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

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

2020-07-07 Thread ahf

commit 80ae7d305a2a8f255f1acb558346225a04bea388
Merge: 9c0e3e573 d4c79cae7
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jul 7 14:48:36 2020 +

Merge branch 'maint-0.4.4' into release-0.4.4

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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

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

2020-07-07 Thread ahf

commit d4c79cae76536673184ffd4f6116bcd07fd0b1f5
Merge: 05ca50c9a a213d2793
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jul 7 14:48:36 2020 +

Merge branch 'maint-0.4.3' into maint-0.4.4

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)




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

[tor-commits] [tor/release-0.4.3] CI: Fix Appveyor printf format error

2020-07-07 Thread ahf

commit d9cc2b2928eab045f89d0abf95a9e5c75e290ff8
Author: David Goulet 
Date:   Tue Jul 7 09:20:28 2020 -0400

CI: Fix Appveyor printf format error

For some reasons, Appveyor started to use the stdio printf format for 64 bit
values (PRIu64, ...). Mingw doesn't like that so force it to use the Windows
specific macros by setting D__USE_MINGW_ANSI_STDIO=0.

Fixes #40026
---
 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 461eacb4a..03cf2f69f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -87,7 +87,7 @@ build_script:
  # mingw zstd doesn't come with a pkg-config file, so we manually
  # configure its flags. liblzma just works.
  #>
-Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--with-openssl-dir=/${env:compiler_path} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening}"
+Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--with-openssl-dir=/${env:compiler_path} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening} CFLAGS='-D__USE_MINGW_ANSI_STDIO=0'"
 Execute-Bash "V=1 make -k -j2"
 Execute-Bash "V=1 make -k -j2 install"
  }
diff --git a/changes/ticket40026 b/changes/ticket40026
new file mode 100644
index 0..f87c2964e
--- /dev/null
+++ b/changes/ticket40026
@@ -0,0 +1,3 @@
+  o Minor bugfix (CI, Windows):
+- Don't use stdio 64 bit printf format when compiling with MINGW on
+  Appveyor. Fixes bug 40026; bugfix on 0.3.5.5-alpha.



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

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-07-07 Thread ahf

commit a213d2793860240b315f372159311f307aed68ca
Merge: 5a5ff3d8c 19d579e8c
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jul 7 14:48:36 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-07-07 Thread ahf

commit d4c79cae76536673184ffd4f6116bcd07fd0b1f5
Merge: 05ca50c9a a213d2793
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jul 7 14:48:36 2020 +

Merge branch 'maint-0.4.3' into maint-0.4.4

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

___
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.4.3' into maint-0.4.4

2020-07-07 Thread ahf

commit d4c79cae76536673184ffd4f6116bcd07fd0b1f5
Merge: 05ca50c9a a213d2793
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jul 7 14:48:36 2020 +

Merge branch 'maint-0.4.3' into maint-0.4.4

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)




___
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.5] CI: Fix Appveyor printf format error

2020-07-07 Thread ahf

commit d9cc2b2928eab045f89d0abf95a9e5c75e290ff8
Author: David Goulet 
Date:   Tue Jul 7 09:20:28 2020 -0400

CI: Fix Appveyor printf format error

For some reasons, Appveyor started to use the stdio printf format for 64 bit
values (PRIu64, ...). Mingw doesn't like that so force it to use the Windows
specific macros by setting D__USE_MINGW_ANSI_STDIO=0.

Fixes #40026
---
 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 461eacb4a..03cf2f69f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -87,7 +87,7 @@ build_script:
  # mingw zstd doesn't come with a pkg-config file, so we manually
  # configure its flags. liblzma just works.
  #>
-Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--with-openssl-dir=/${env:compiler_path} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening}"
+Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--with-openssl-dir=/${env:compiler_path} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening} CFLAGS='-D__USE_MINGW_ANSI_STDIO=0'"
 Execute-Bash "V=1 make -k -j2"
 Execute-Bash "V=1 make -k -j2 install"
  }
diff --git a/changes/ticket40026 b/changes/ticket40026
new file mode 100644
index 0..f87c2964e
--- /dev/null
+++ b/changes/ticket40026
@@ -0,0 +1,3 @@
+  o Minor bugfix (CI, Windows):
+- Don't use stdio 64 bit printf format when compiling with MINGW on
+  Appveyor. Fixes bug 40026; bugfix on 0.3.5.5-alpha.



___
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.4.2' into maint-0.4.3

2020-07-07 Thread ahf

commit a213d2793860240b315f372159311f307aed68ca
Merge: 5a5ff3d8c 19d579e8c
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jul 7 14:48:36 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-07-07 Thread ahf

commit 19d579e8cbb7bd95ed4fd50697c689ab7b725963
Merge: 07d8d398c d9cc2b292
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jul 7 14:48:35 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)



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

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

2020-07-07 Thread ahf

commit 19d579e8cbb7bd95ed4fd50697c689ab7b725963
Merge: 07d8d398c d9cc2b292
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jul 7 14:48:35 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/maint-0.4.4] CI: Fix Appveyor printf format error

2020-07-07 Thread ahf

commit d9cc2b2928eab045f89d0abf95a9e5c75e290ff8
Author: David Goulet 
Date:   Tue Jul 7 09:20:28 2020 -0400

CI: Fix Appveyor printf format error

For some reasons, Appveyor started to use the stdio printf format for 64 bit
values (PRIu64, ...). Mingw doesn't like that so force it to use the Windows
specific macros by setting D__USE_MINGW_ANSI_STDIO=0.

Fixes #40026
---
 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 461eacb4a..03cf2f69f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -87,7 +87,7 @@ build_script:
  # mingw zstd doesn't come with a pkg-config file, so we manually
  # configure its flags. liblzma just works.
  #>
-Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--with-openssl-dir=/${env:compiler_path} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening}"
+Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--with-openssl-dir=/${env:compiler_path} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening} CFLAGS='-D__USE_MINGW_ANSI_STDIO=0'"
 Execute-Bash "V=1 make -k -j2"
 Execute-Bash "V=1 make -k -j2 install"
  }
diff --git a/changes/ticket40026 b/changes/ticket40026
new file mode 100644
index 0..f87c2964e
--- /dev/null
+++ b/changes/ticket40026
@@ -0,0 +1,3 @@
+  o Minor bugfix (CI, Windows):
+- Don't use stdio 64 bit printf format when compiling with MINGW on
+  Appveyor. Fixes bug 40026; bugfix on 0.3.5.5-alpha.



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

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-07-07 Thread ahf

commit a213d2793860240b315f372159311f307aed68ca
Merge: 5a5ff3d8c 19d579e8c
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jul 7 14:48:36 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-07-07 Thread ahf

commit 19d579e8cbb7bd95ed4fd50697c689ab7b725963
Merge: 07d8d398c d9cc2b292
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jul 7 14:48:35 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/release-0.4.4] CI: Fix Appveyor printf format error

2020-07-07 Thread ahf

commit d9cc2b2928eab045f89d0abf95a9e5c75e290ff8
Author: David Goulet 
Date:   Tue Jul 7 09:20:28 2020 -0400

CI: Fix Appveyor printf format error

For some reasons, Appveyor started to use the stdio printf format for 64 bit
values (PRIu64, ...). Mingw doesn't like that so force it to use the Windows
specific macros by setting D__USE_MINGW_ANSI_STDIO=0.

Fixes #40026
---
 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 461eacb4a..03cf2f69f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -87,7 +87,7 @@ build_script:
  # mingw zstd doesn't come with a pkg-config file, so we manually
  # configure its flags. liblzma just works.
  #>
-Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--with-openssl-dir=/${env:compiler_path} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening}"
+Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--with-openssl-dir=/${env:compiler_path} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening} CFLAGS='-D__USE_MINGW_ANSI_STDIO=0'"
 Execute-Bash "V=1 make -k -j2"
 Execute-Bash "V=1 make -k -j2 install"
  }
diff --git a/changes/ticket40026 b/changes/ticket40026
new file mode 100644
index 0..f87c2964e
--- /dev/null
+++ b/changes/ticket40026
@@ -0,0 +1,3 @@
+  o Minor bugfix (CI, Windows):
+- Don't use stdio 64 bit printf format when compiling with MINGW on
+  Appveyor. Fixes bug 40026; bugfix on 0.3.5.5-alpha.



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

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-07-07 Thread ahf

commit 19d579e8cbb7bd95ed4fd50697c689ab7b725963
Merge: 07d8d398c d9cc2b292
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jul 7 14:48:35 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)



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

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

2020-07-07 Thread ahf

commit be3baeb879387154ec5eae0cf9487ff1e489f4d3
Merge: 0e10a162b 19d579e8c
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jul 7 14:48:36 2020 +

Merge branch 'maint-0.4.2' into release-0.4.2

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/master] CI: Fix Appveyor printf format error

2020-07-07 Thread ahf

commit d9cc2b2928eab045f89d0abf95a9e5c75e290ff8
Author: David Goulet 
Date:   Tue Jul 7 09:20:28 2020 -0400

CI: Fix Appveyor printf format error

For some reasons, Appveyor started to use the stdio printf format for 64 bit
values (PRIu64, ...). Mingw doesn't like that so force it to use the Windows
specific macros by setting D__USE_MINGW_ANSI_STDIO=0.

Fixes #40026
---
 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 461eacb4a..03cf2f69f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -87,7 +87,7 @@ build_script:
  # mingw zstd doesn't come with a pkg-config file, so we manually
  # configure its flags. liblzma just works.
  #>
-Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--with-openssl-dir=/${env:compiler_path} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening}"
+Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--with-openssl-dir=/${env:compiler_path} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening} CFLAGS='-D__USE_MINGW_ANSI_STDIO=0'"
 Execute-Bash "V=1 make -k -j2"
 Execute-Bash "V=1 make -k -j2 install"
  }
diff --git a/changes/ticket40026 b/changes/ticket40026
new file mode 100644
index 0..f87c2964e
--- /dev/null
+++ b/changes/ticket40026
@@ -0,0 +1,3 @@
+  o Minor bugfix (CI, Windows):
+- Don't use stdio 64 bit printf format when compiling with MINGW on
+  Appveyor. Fixes bug 40026; bugfix on 0.3.5.5-alpha.



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

[tor-commits] [tor/release-0.4.2] CI: Fix Appveyor printf format error

2020-07-07 Thread ahf

commit d9cc2b2928eab045f89d0abf95a9e5c75e290ff8
Author: David Goulet 
Date:   Tue Jul 7 09:20:28 2020 -0400

CI: Fix Appveyor printf format error

For some reasons, Appveyor started to use the stdio printf format for 64 bit
values (PRIu64, ...). Mingw doesn't like that so force it to use the Windows
specific macros by setting D__USE_MINGW_ANSI_STDIO=0.

Fixes #40026
---
 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 461eacb4a..03cf2f69f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -87,7 +87,7 @@ build_script:
  # mingw zstd doesn't come with a pkg-config file, so we manually
  # configure its flags. liblzma just works.
  #>
-Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--with-openssl-dir=/${env:compiler_path} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening}"
+Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--with-openssl-dir=/${env:compiler_path} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening} CFLAGS='-D__USE_MINGW_ANSI_STDIO=0'"
 Execute-Bash "V=1 make -k -j2"
 Execute-Bash "V=1 make -k -j2 install"
  }
diff --git a/changes/ticket40026 b/changes/ticket40026
new file mode 100644
index 0..f87c2964e
--- /dev/null
+++ b/changes/ticket40026
@@ -0,0 +1,3 @@
+  o Minor bugfix (CI, Windows):
+- Don't use stdio 64 bit printf format when compiling with MINGW on
+  Appveyor. Fixes bug 40026; bugfix on 0.3.5.5-alpha.



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

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-07-07 Thread ahf

commit 19d579e8cbb7bd95ed4fd50697c689ab7b725963
Merge: 07d8d398c d9cc2b292
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jul 7 14:48:35 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)



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

2020-07-07 Thread ahf

commit 7759fee482833c44e053252b8df249075791793d
Merge: b66953a3f d9cc2b292
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jul 7 14:48:35 2020 +

Merge branch 'maint-0.3.5' into release-0.3.5

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.4.2] CI: Fix Appveyor printf format error

2020-07-07 Thread ahf

commit d9cc2b2928eab045f89d0abf95a9e5c75e290ff8
Author: David Goulet 
Date:   Tue Jul 7 09:20:28 2020 -0400

CI: Fix Appveyor printf format error

For some reasons, Appveyor started to use the stdio printf format for 64 bit
values (PRIu64, ...). Mingw doesn't like that so force it to use the Windows
specific macros by setting D__USE_MINGW_ANSI_STDIO=0.

Fixes #40026
---
 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 461eacb4a..03cf2f69f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -87,7 +87,7 @@ build_script:
  # mingw zstd doesn't come with a pkg-config file, so we manually
  # configure its flags. liblzma just works.
  #>
-Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--with-openssl-dir=/${env:compiler_path} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening}"
+Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--with-openssl-dir=/${env:compiler_path} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening} CFLAGS='-D__USE_MINGW_ANSI_STDIO=0'"
 Execute-Bash "V=1 make -k -j2"
 Execute-Bash "V=1 make -k -j2 install"
  }
diff --git a/changes/ticket40026 b/changes/ticket40026
new file mode 100644
index 0..f87c2964e
--- /dev/null
+++ b/changes/ticket40026
@@ -0,0 +1,3 @@
+  o Minor bugfix (CI, Windows):
+- Don't use stdio 64 bit printf format when compiling with MINGW on
+  Appveyor. Fixes bug 40026; bugfix on 0.3.5.5-alpha.



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

2020-07-07 Thread ahf

commit aa80f73fc426057cc59c6c473351d86f6983803c
Merge: bc63f59f3 d4c79cae7
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jul 7 14:48:36 2020 +

Merge branch 'maint-0.4.4'

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.4.3] CI: Fix Appveyor printf format error

2020-07-07 Thread ahf

commit d9cc2b2928eab045f89d0abf95a9e5c75e290ff8
Author: David Goulet 
Date:   Tue Jul 7 09:20:28 2020 -0400

CI: Fix Appveyor printf format error

For some reasons, Appveyor started to use the stdio printf format for 64 bit
values (PRIu64, ...). Mingw doesn't like that so force it to use the Windows
specific macros by setting D__USE_MINGW_ANSI_STDIO=0.

Fixes #40026
---
 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 461eacb4a..03cf2f69f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -87,7 +87,7 @@ build_script:
  # mingw zstd doesn't come with a pkg-config file, so we manually
  # configure its flags. liblzma just works.
  #>
-Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--with-openssl-dir=/${env:compiler_path} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening}"
+Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--with-openssl-dir=/${env:compiler_path} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening} CFLAGS='-D__USE_MINGW_ANSI_STDIO=0'"
 Execute-Bash "V=1 make -k -j2"
 Execute-Bash "V=1 make -k -j2 install"
  }
diff --git a/changes/ticket40026 b/changes/ticket40026
new file mode 100644
index 0..f87c2964e
--- /dev/null
+++ b/changes/ticket40026
@@ -0,0 +1,3 @@
+  o Minor bugfix (CI, Windows):
+- Don't use stdio 64 bit printf format when compiling with MINGW on
+  Appveyor. Fixes bug 40026; bugfix on 0.3.5.5-alpha.



___
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.5' into maint-0.4.2

2020-07-07 Thread ahf

commit 19d579e8cbb7bd95ed4fd50697c689ab7b725963
Merge: 07d8d398c d9cc2b292
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jul 7 14:48:35 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-07-07 Thread ahf

commit 19d579e8cbb7bd95ed4fd50697c689ab7b725963
Merge: 07d8d398c d9cc2b292
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jul 7 14:48:35 2020 +

Merge branch 'maint-0.3.5' into maint-0.4.2

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-07-07 Thread ahf

commit a213d2793860240b315f372159311f307aed68ca
Merge: 5a5ff3d8c 19d579e8c
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jul 7 14:48:36 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

___
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.5] CI: Fix Appveyor printf format error

2020-07-07 Thread ahf

commit d9cc2b2928eab045f89d0abf95a9e5c75e290ff8
Author: David Goulet 
Date:   Tue Jul 7 09:20:28 2020 -0400

CI: Fix Appveyor printf format error

For some reasons, Appveyor started to use the stdio printf format for 64 bit
values (PRIu64, ...). Mingw doesn't like that so force it to use the Windows
specific macros by setting D__USE_MINGW_ANSI_STDIO=0.

Fixes #40026
---
 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 461eacb4a..03cf2f69f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -87,7 +87,7 @@ build_script:
  # mingw zstd doesn't come with a pkg-config file, so we manually
  # configure its flags. liblzma just works.
  #>
-Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--with-openssl-dir=/${env:compiler_path} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening}"
+Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' 
ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure 
--prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} 
--with-openssl-dir=/${env:compiler_path} --disable-asciidoc 
--enable-fatal-warnings ${env:hardening} CFLAGS='-D__USE_MINGW_ANSI_STDIO=0'"
 Execute-Bash "V=1 make -k -j2"
 Execute-Bash "V=1 make -k -j2 install"
  }
diff --git a/changes/ticket40026 b/changes/ticket40026
new file mode 100644
index 0..f87c2964e
--- /dev/null
+++ b/changes/ticket40026
@@ -0,0 +1,3 @@
+  o Minor bugfix (CI, Windows):
+- Don't use stdio 64 bit printf format when compiling with MINGW on
+  Appveyor. Fixes bug 40026; bugfix on 0.3.5.5-alpha.

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

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

2020-07-07 Thread ahf

commit a213d2793860240b315f372159311f307aed68ca
Merge: 5a5ff3d8c 19d579e8c
Author: Alexander FÃ¦rÃ¸y 
Date:   Tue Jul 7 14:48:36 2020 +

Merge branch 'maint-0.4.2' into maint-0.4.3

 .appveyor.yml   | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/master] Add correct exclusions to Doxyfile.in.

2020-07-07 Thread nickm

commit bc63f59f3c45c61296aac94411f9ab73cfbda322
Author: Nick Mathewson 
Date:   Tue Jul 7 10:24:24 2020 -0400

Add correct exclusions to Doxyfile.in.

Now that we have src/ext/ext.md (since b0a716dfb0a73920ac4f), we
don't want to have src/ext excluded in its entirety.

Like a smart person, when I added src/ext/ext.md, I edited Doxyfile,
forgetting that it is generated from Doxyfile.in.  :/

This should fix travis builds.
---
 Doxyfile.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Doxyfile.in b/Doxyfile.in
index 503c1302d..4374e5485 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -863,7 +863,8 @@ RECURSIVE  = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE= ./src/ext \
+EXCLUDE= ./src/ext/ed25519 \
+ ./src/ext/rust \
  ./src/trunnel \
  ./src/test \
  ./src/rust/registry

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

[tor-commits] [tor/master] Fix coccinelle complaint in test-memwipe.c

2020-07-07 Thread asn

commit 2aa5e95f58d70ab1ab610ddbfe72da460f35be09
Author: Nick Mathewson 
Date:   Mon Jul 6 15:18:28 2020 -0400

Fix coccinelle complaint in test-memwipe.c
---
 src/test/test-memwipe.c | 23 +++
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c
index 4faf7bc5a..5e4cc7678 100644
--- a/src/test/test-memwipe.c
+++ b/src/test/test-memwipe.c
@@ -30,8 +30,8 @@ const char *s = NULL;
 #define BUF_LEN 2048
 
 #define FILL_BUFFER_IMPL()  \
+  do {  \
   unsigned int i;   \
-  unsigned sum = 0; \
 \
   /* Fill up a 1k buffer with a recognizable pattern. */\
   for (i = 0; i < BUF_LEN; i += strlen(s)) {\
@@ -42,7 +42,8 @@ const char *s = NULL;
   /* optimized away. */ \
   for (i = 0; i < BUF_LEN; ++i) {   \
 sum += (unsigned char)buf[i];   \
-  }
+  } \
+  } while (0)
 
 #ifdef OpenBSD
 /* Disable some of OpenBSD's malloc protections for this test. This helps
@@ -55,7 +56,8 @@ static unsigned
 fill_a_buffer_memset(void)
 {
   char buf[BUF_LEN];
-  FILL_BUFFER_IMPL()
+  unsigned sum = 0;
+  FILL_BUFFER_IMPL();
   memset(buf, 0, sizeof(buf));
   return sum;
 }
@@ -64,7 +66,8 @@ static unsigned
 fill_a_buffer_memwipe(void)
 {
   char buf[BUF_LEN];
-  FILL_BUFFER_IMPL()
+  unsigned sum = 0;
+  FILL_BUFFER_IMPL();
   memwipe(buf, 0, sizeof(buf));
   return sum;
 }
@@ -73,7 +76,8 @@ static unsigned
 fill_a_buffer_nothing(void)
 {
   char buf[BUF_LEN];
-  FILL_BUFFER_IMPL()
+  unsigned sum = 0;
+  FILL_BUFFER_IMPL();
   return sum;
 }
 
@@ -116,7 +120,8 @@ static unsigned
 fill_heap_buffer_memset(void)
 {
   char *buf = heap_buf = raw_malloc(BUF_LEN);
-  FILL_BUFFER_IMPL()
+  unsigned sum = 0;
+  FILL_BUFFER_IMPL();
   memset(buf, 0, BUF_LEN);
   raw_free(buf);
   return sum;
@@ -126,7 +131,8 @@ static unsigned
 fill_heap_buffer_memwipe(void)
 {
   char *buf = heap_buf = raw_malloc(BUF_LEN);
-  FILL_BUFFER_IMPL()
+  unsigned sum = 0;
+  FILL_BUFFER_IMPL();
   memwipe(buf, 0, BUF_LEN);
   raw_free(buf);
   return sum;
@@ -136,7 +142,8 @@ static unsigned
 fill_heap_buffer_nothing(void)
 {
   char *buf = heap_buf = raw_malloc(BUF_LEN);
-  FILL_BUFFER_IMPL()
+  unsigned sum = 0;
+  FILL_BUFFER_IMPL();
   raw_free(buf);
   return sum;
 }



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

[tor-commits] [tor/master] Fix coccinelle complaint in test_config.c

2020-07-07 Thread asn

commit 1ee748e4ca80b6708e737b76184c0fb9980d55cd
Author: Nick Mathewson 
Date:   Mon Jul 6 15:17:47 2020 -0400

Fix coccinelle complaint in test_config.c
---
 src/test/test_config.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/test_config.c b/src/test/test_config.c
index 045dbde0d..765db03c0 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -6413,11 +6413,13 @@ test_config_getinfo_config_names(void *arg)
   tor_free(answer);
 }
 
+#ifndef COCCI
 #define CONFIG_TEST(name, flags)  \
   { #name, test_config_ ## name, flags, NULL, NULL }
 
 #define CONFIG_TEST_SETUP(suffix, name, flags, setup, setup_data) \
   { #name#suffix, test_config_ ## name, flags, setup, setup_data }
+#endif
 
 struct testcase_t config_tests[] = {
   CONFIG_TEST(adding_trusted_dir_server, TT_FORK),



___
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 'tor-github/pr/1973'

2020-07-07 Thread asn

commit 86fdddccb27f15edcfd49038c87a0f66c11fb52e
Merge: 9cefc4723 2aa5e95f5
Author: George Kadianakis 
Date:   Tue Jul 7 15:34:14 2020 +0300

Merge branch 'tor-github/pr/1973'

 src/test/test-memwipe.c | 23 +++
 src/test/test_config.c  |  2 ++
 2 files changed, 17 insertions(+), 8 deletions(-)

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

[tor-commits] [tor/master] add changes file for ticket31699

2020-07-07 Thread dgoulet

commit 9cefc47231a4bb8024668fe7152a4fb811faaa1f
Author: Bartosz Duszel 
Date:   Wed Apr 8 21:08:15 2020 +0200

add changes file for ticket31699
---
 changes/ticket31699 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/ticket31699 b/changes/ticket31699
new file mode 100644
index 0..1998248d5
--- /dev/null
+++ b/changes/ticket31699
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring (autoconf):
+- Remove autoconf checks for unused funcs and headers. Closes ticket
+  31699; Patch by @bduszel

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

[tor-commits] [tor/master] remove autoconf check for syslimits

2020-07-07 Thread dgoulet

commit 06dafe8c1f497a2c1c54f464722f374c6dd1185e
Author: Bartosz Duszel 
Date:   Sun Mar 22 20:42:00 2020 +0100

remove autoconf check for syslimits
---
 configure.ac | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index ede8efbf1..3f08a566d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1590,7 +1590,6 @@ AC_CHECK_HEADERS([errno.h \
  sys/statvfs.h \
  sys/syscall.h \
  sys/sysctl.h \
- sys/syslimits.h \
  sys/time.h \
  sys/types.h \
  sys/un.h \



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

[tor-commits] [tor/master] remove autoconf check for malloc

2020-07-07 Thread dgoulet

commit c890a06fe45b39a70facb8526b4a7db9297b2493
Author: Bartosz Duszel 
Date:   Tue Mar 24 07:42:03 2020 +0100

remove autoconf check for malloc
---
 configure.ac | 2 --
 1 file changed, 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 854eaa9fc..a6df7149a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1566,8 +1566,6 @@ AC_CHECK_HEADERS([errno.h \
  mach/vm_inherit.h \
  machine/limits.h \
  malloc.h \
- malloc/malloc.h \
- malloc_np.h \
  netdb.h \
  netinet/in.h \
  netinet/in6.h \



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

[tor-commits] [tor/master] remove autoconf check for htonll

2020-07-07 Thread dgoulet

commit b192bc6ff325e1d603f16bfa2edcac8a8194a936
Author: Bartosz Duszel 
Date:   Tue Mar 24 07:30:24 2020 +0100

remove autoconf check for htonll
---
 configure.ac | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 3f08a566d..ef07b92ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -683,7 +683,6 @@ AC_CHECK_FUNCS(
gettimeofday \
gmtime_r \
gnu_get_libc_version \
-   htonll \
inet_aton \
ioctl \
issetugid \



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

[tor-commits] [tor/master] remove autoconf check for getpass

2020-07-07 Thread dgoulet

commit 3ebf3cf9467cfb82f856ca37b3aeacaa8815ab44
Author: Bartosz Duszel 
Date:   Sun Mar 22 20:40:15 2020 +0100

remove autoconf check for getpass
---
 configure.ac | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index dcd1ce7e7..ede8efbf1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -679,7 +679,6 @@ AC_CHECK_FUNCS(
getdelim \
getifaddrs \
getline \
-   getpass \
getrlimit \
gettimeofday \
gmtime_r \



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

[tor-commits] [tor/master] remove autoconf check for EVP_sha3_256

2020-07-07 Thread dgoulet

commit da85062631d10c9dd48fe1f818a9b85b71181f23
Author: Bartosz Duszel 
Date:   Tue Mar 24 07:38:43 2020 +0100

remove autoconf check for EVP_sha3_256
---
 configure.ac | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index ef07b92ff..854eaa9fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1040,7 +1040,6 @@ dnl to them.
 AC_CHECK_FUNCS([ \
ERR_load_KDF_strings \
EVP_PBE_scrypt \
-   EVP_sha3_256 \
SSL_CIPHER_find \
SSL_CTX_set1_groups_list \
SSL_CTX_set_security_level \



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

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2020-07-07 Thread translation

commit 638e3ebc9afc201f716281c42ab3faaaf6ac2d26
Author: Translation commit bot 
Date:   Tue Jul 7 08:48:09 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+it.po | 45 -
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/contents+it.po b/contents+it.po
index d84a0c5a1d..60f43acf9f 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -12,7 +12,7 @@
 # Francesca Davis , 2019
 # giulio marino , 2020
 # Gabriele , 2020
-# Matteo Sechi , 2020
+# c2ed1e40dec4c77110b8433ca0e8b4a8_488379a 
<85dd5f0e022835b2532b5ca0658d8435_534014>, 2020
 # Gio Doro , 2020
 # Luke <94lukecatell...@gmail.com>, 2020
 # erinm, 2020
@@ -3891,6 +3891,11 @@ msgid ""
 "2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-;
 "fingerprinting-technique-called-letterboxing/)."
 msgstr ""
+"Tor Browser 9 viene fornito con una difesa anche per questi scenari, che Ã¨ "
+"chiamata [Letterbox](https://it.wikipedia.org/wiki/Letterbox), una tecnica "
+"sviluppata da Mozilla e [presentata nel 2019](https://www.zdnet.com/article;
+"/firefox-to-add-tor-browser-anti-fingerprinting-technique-called-"
+"letterboxing/)."
 
 #: https//support.torproject.org/tbb/maximized-torbrowser-window/
 #: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description)
@@ -4686,6 +4691,8 @@ msgid ""
 "Both options are located in the [hamburger menu (\"â¡\")](../../glossary"
 "/hamburger-menu)."
 msgstr ""
+"Entrambe le opzioni sono collocate nel [menu ad hamburger "
+"(\"â¡\")](../../glossary/hamburger-menu)."
 
 #: https//support.torproject.org/tbb/tbb-29/
 #: (content/tbb/tbb-29/contents+en.lrquestion.description)
@@ -4922,6 +4929,8 @@ msgid ""
 "There are methods for setting Tor Browser as your default browser, but those"
 " methods may not work always or in every operating system."
 msgstr ""
+"Ci sono metodi per impostare Tor Browser come browser predefinito, ma "
+"potrebbero non sempre funzionare o in tutti i sistemi operativi."
 
 #: https//support.torproject.org/tbb/tbb-32/
 #: (content/tbb/tbb-32/contents+en.lrquestion.description)
@@ -4968,6 +4977,8 @@ msgid ""
 "If you'd like to become a relay, please see our [Tor Relay "
 "Guide](https://community.torproject.org/relay)."
 msgstr ""
+"Se desideri diventare un relÃ¨, dai un'occhiata alla nostra [Guida Tor "
+"Relay](https://community.torproject.org/relay)."
 
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.title)
@@ -5405,6 +5416,8 @@ msgid ""
 "You can try 'change the circuit for this site' to access the website from a "
 "different IP address."
 msgstr ""
+"Puoi provare 'cambia il circuito per questo sito' per accedere al sito da un"
+" indirizzo IP diverso."
 
 #: https//support.torproject.org/tbb/tbb-44/
 #: (content/tbb/tbb-44/contents+en.lrquestion.description)
@@ -6301,6 +6314,8 @@ msgid ""
 "If youâre having trouble connecting, an error message may appear and you 
can"
 " select the option to \"copy Tor log to clipboard\"."
 msgstr ""
+"Se hai dei problemi nel connetterti, potrebbe apparire un messaggio di "
+"errore e puoi selezionare l'opzione \"copia il log di Tor negli appunti\"."
 
 #: https//support.torproject.org/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
@@ -6317,6 +6332,9 @@ msgid ""
 "menu), then click on \"Preferences\", and finally on \"Tor\" in the side "
 "bar."
 msgstr ""
+"Altrimenti, se non vedi questa opzione e hai Tor Browser aperto, puoi "
+"navigare nel [menu hamburger (\"â¡\")](../glossary/hamburger-menu), poi "
+"cliccare \"Preferenze\" e infine \"Tor\" nella barra laterale."
 
 #: https//support.torproject.org/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
@@ -7333,6 +7351,11 @@ msgid ""
 "running an exit node with minimal "
 "harassment](https://blog.torproject.org/blog/tips-running-exit-node)."
 msgstr ""
+"Consulta il [Supporto sui problemi che potresti "
+"riscontrare](https://support.torproject.org/abuse/exit-relay-expectations/) "
+"se usi la politica predefinita, e poi leggi i [suggerimenti per l'esecuzione"
+" di un nodo di uscita con problemi minimi](https://blog.torproject.org/blog;
+"/tips-running-exit-node) di Mike Perry."
 
 #: https//support.torproject.org/operators/exit-policies/
 #: (content/operators/exit-policies/contents+en.lrquestion.description)
@@ -7470,12 +7493,12 @@ msgstr "```"
 #: https//support.torproject.org/operators/hibernation/
 #: (content/operators/hibernation/contents+en.lrquestion.description)
 msgid "Bandwidth soft limit reached; commencing hibernation."
-msgstr ""
+msgstr "Limite della banda di rete raggiunto; avvio dell'ibernazione."
 
 #: https//support.torproject.org/operators/hibernation/
 #: (content/operators/hibernation/contents+en.lrquestion.description)
 msgid "No new connections will be accepted"
-msgstr ""
+msgstr "Non verranno accettate nuove

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2020-07-07 Thread translation

commit 0df32b223768f4726a31beac65c9ed68a442672b
Author: Translation commit bot 
Date:   Tue Jul 7 08:46:32 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 it.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/it.po b/it.po
index 2e7c82ab3c..82357be436 100644
--- a/it.po
+++ b/it.po
@@ -34,7 +34,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 19:37+0200\n"
-"PO-Revision-Date: 2020-07-07 08:15+\n"
+"PO-Revision-Date: 2020-07-07 08:24+\n"
 "Last-Translator: Random_R\n"
 "Language-Team: Italian 
(http://www.transifex.com/otf/torproject/language/it/)\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

1 2 >

1 - 100 of 104 matches

Mail list logo