date:20171023

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

2017-10-23 Thread nickm

commit 0f1b510b60dcc5edb7332615c10097fce0d216a3
Merge: fe022f3ab 9ae4ffc07
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:48 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 5 +
 2 files changed, 8 insertions(+)

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

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

2017-10-23 Thread nickm

commit f0a6ea0bfd6afaa718c6b3d521a5d195d47ba56d
Merge: af33fdd7c 9ae4ffc07
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:48 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 5 +
 2 files changed, 8 insertions(+)




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

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

2017-10-23 Thread nickm

commit 9ae4ffc0763fcb0a50d0d02be7d3362cc496adc1
Merge: eac4c374e b1bd1bf19
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:08 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 5 +
 2 files changed, 8 insertions(+)




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

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

2017-10-23 Thread nickm

commit f0a6ea0bfd6afaa718c6b3d521a5d195d47ba56d
Merge: af33fdd7c 9ae4ffc07
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:48 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 5 +
 2 files changed, 8 insertions(+)




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

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

2017-10-23 Thread nickm

commit 9ae4ffc0763fcb0a50d0d02be7d3362cc496adc1
Merge: eac4c374e b1bd1bf19
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:08 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 5 +
 2 files changed, 8 insertions(+)




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

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

2017-10-23 Thread nickm

commit b1d6cf2508e57c98017412446024c9dd6587fe63
Merge: 8b8d50104 f0a6ea0bf
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:48 2017 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 5 +
 2 files changed, 8 insertions(+)

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

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

2017-10-23 Thread nickm

commit b1bd1bf19f7e17a94cefaccb63e5608fda1df4e2
Merge: fcd5c3144 5bca66be4
Author: Nick Mathewson 
Date:   Mon Oct 23 15:53:45 2017 -0400

Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 8 
 2 files changed, 11 insertions(+)



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

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

2017-10-23 Thread nickm

commit 9ae4ffc0763fcb0a50d0d02be7d3362cc496adc1
Merge: eac4c374e b1bd1bf19
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:08 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 5 +
 2 files changed, 8 insertions(+)




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

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

2017-10-23 Thread nickm

commit b1bd1bf19f7e17a94cefaccb63e5608fda1df4e2
Merge: fcd5c3144 5bca66be4
Author: Nick Mathewson 
Date:   Mon Oct 23 15:53:45 2017 -0400

Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 8 
 2 files changed, 11 insertions(+)



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

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

2017-10-23 Thread nickm

commit f0a6ea0bfd6afaa718c6b3d521a5d195d47ba56d
Merge: af33fdd7c 9ae4ffc07
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:48 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 5 +
 2 files changed, 8 insertions(+)




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

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

2017-10-23 Thread nickm

commit 4dad6123cf7bd9f52225dc89eb0c2e3ae28da7b2
Merge: df4eba5c2 b1bd1bf19
Author: Nick Mathewson 
Date:   Mon Oct 23 15:53:50 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 8 
 2 files changed, 11 insertions(+)

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

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

2017-10-23 Thread nickm

commit 9ae4ffc0763fcb0a50d0d02be7d3362cc496adc1
Merge: eac4c374e b1bd1bf19
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:08 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 5 +
 2 files changed, 8 insertions(+)




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

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

2017-10-23 Thread nickm

commit b1bd1bf19f7e17a94cefaccb63e5608fda1df4e2
Merge: fcd5c3144 5bca66be4
Author: Nick Mathewson 
Date:   Mon Oct 23 15:53:45 2017 -0400

Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 8 
 2 files changed, 11 insertions(+)



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

[tor-commits] [tor/release-0.2.9] Clear the address when node_get_prim_orport() returns early

2017-10-23 Thread nickm

commit 5bca66be497f18b94a85ad8eb836fff5a356627d
Author: teor 
Date:   Sun Oct 15 16:45:15 2017 -0400

Clear the address when node_get_prim_orport() returns early

Fixes bug 23874; bugfix on 0.2.8.2-alpha.
---
 changes/bug23874  | 3 +++
 src/or/nodelist.c | 8 
 2 files changed, 11 insertions(+)

diff --git a/changes/bug23874 b/changes/bug23874
new file mode 100644
index 0..bf6620553
--- /dev/null
+++ b/changes/bug23874
@@ -0,0 +1,3 @@
+  o Minor bugfixes (memory safety):
+- Clear the address when node_get_prim_orport() returns early.
+  Fixes bug 23874; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 070e2e9e0..0e9a65181 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1031,6 +1031,14 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t 
*ap_out)
   node_assert_ok(node);
   tor_assert(ap_out);
 
+  /* Clear the address, as a safety precaution if calling functions ignore the
+   * return value */
+  tor_addr_make_null(_out->addr, AF_INET);
+  ap_out->port = 0;
+
+  /* Check ri first, because rewrite_node_address_for_bridge() updates
+   * node->ri with the configured bridge address. */
+
   RETURN_IPV4_AP(node->ri, or_port, ap_out);
   RETURN_IPV4_AP(node->rs, or_port, ap_out);
   /* Microdescriptors only have an IPv6 address */



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

[tor-commits] [tor/release-0.3.2] Clear the address when node_get_prim_orport() returns early

2017-10-23 Thread nickm

commit 5bca66be497f18b94a85ad8eb836fff5a356627d
Author: teor 
Date:   Sun Oct 15 16:45:15 2017 -0400

Clear the address when node_get_prim_orport() returns early

Fixes bug 23874; bugfix on 0.2.8.2-alpha.
---
 changes/bug23874  | 3 +++
 src/or/nodelist.c | 8 
 2 files changed, 11 insertions(+)

diff --git a/changes/bug23874 b/changes/bug23874
new file mode 100644
index 0..bf6620553
--- /dev/null
+++ b/changes/bug23874
@@ -0,0 +1,3 @@
+  o Minor bugfixes (memory safety):
+- Clear the address when node_get_prim_orport() returns early.
+  Fixes bug 23874; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 070e2e9e0..0e9a65181 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1031,6 +1031,14 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t 
*ap_out)
   node_assert_ok(node);
   tor_assert(ap_out);
 
+  /* Clear the address, as a safety precaution if calling functions ignore the
+   * return value */
+  tor_addr_make_null(_out->addr, AF_INET);
+  ap_out->port = 0;
+
+  /* Check ri first, because rewrite_node_address_for_bridge() updates
+   * node->ri with the configured bridge address. */
+
   RETURN_IPV4_AP(node->ri, or_port, ap_out);
   RETURN_IPV4_AP(node->rs, or_port, ap_out);
   /* Microdescriptors only have an IPv6 address */



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

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

2017-10-23 Thread nickm

commit f7707c9031381cf3ceb663d3bc3a9c81e346a90d
Merge: 880d596f4 b1d6cf250
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:48 2017 -0400

Merge branch 'maint-0.3.2'

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 5 +
 2 files changed, 8 insertions(+)

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

[tor-commits] [tor/maint-0.2.9] Clear the address when node_get_prim_orport() returns early

2017-10-23 Thread nickm

commit 5bca66be497f18b94a85ad8eb836fff5a356627d
Author: teor 
Date:   Sun Oct 15 16:45:15 2017 -0400

Clear the address when node_get_prim_orport() returns early

Fixes bug 23874; bugfix on 0.2.8.2-alpha.
---
 changes/bug23874  | 3 +++
 src/or/nodelist.c | 8 
 2 files changed, 11 insertions(+)

diff --git a/changes/bug23874 b/changes/bug23874
new file mode 100644
index 0..bf6620553
--- /dev/null
+++ b/changes/bug23874
@@ -0,0 +1,3 @@
+  o Minor bugfixes (memory safety):
+- Clear the address when node_get_prim_orport() returns early.
+  Fixes bug 23874; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 070e2e9e0..0e9a65181 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1031,6 +1031,14 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t 
*ap_out)
   node_assert_ok(node);
   tor_assert(ap_out);
 
+  /* Clear the address, as a safety precaution if calling functions ignore the
+   * return value */
+  tor_addr_make_null(_out->addr, AF_INET);
+  ap_out->port = 0;
+
+  /* Check ri first, because rewrite_node_address_for_bridge() updates
+   * node->ri with the configured bridge address. */
+
   RETURN_IPV4_AP(node->ri, or_port, ap_out);
   RETURN_IPV4_AP(node->rs, or_port, ap_out);
   /* Microdescriptors only have an IPv6 address */



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

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

2017-10-23 Thread nickm

commit b1d6cf2508e57c98017412446024c9dd6587fe63
Merge: 8b8d50104 f0a6ea0bf
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:48 2017 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 5 +
 2 files changed, 8 insertions(+)

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

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

2017-10-23 Thread nickm

commit 9ae4ffc0763fcb0a50d0d02be7d3362cc496adc1
Merge: eac4c374e b1bd1bf19
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:08 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 5 +
 2 files changed, 8 insertions(+)

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

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

2017-10-23 Thread nickm

commit b1d6cf2508e57c98017412446024c9dd6587fe63
Merge: 8b8d50104 f0a6ea0bf
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:48 2017 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 5 +
 2 files changed, 8 insertions(+)




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

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

2017-10-23 Thread nickm

commit b1bd1bf19f7e17a94cefaccb63e5608fda1df4e2
Merge: fcd5c3144 5bca66be4
Author: Nick Mathewson 
Date:   Mon Oct 23 15:53:45 2017 -0400

Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 8 
 2 files changed, 11 insertions(+)

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

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

2017-10-23 Thread nickm

commit 9ae4ffc0763fcb0a50d0d02be7d3362cc496adc1
Merge: eac4c374e b1bd1bf19
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:08 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 5 +
 2 files changed, 8 insertions(+)




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

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

2017-10-23 Thread nickm

commit 9ae4ffc0763fcb0a50d0d02be7d3362cc496adc1
Merge: eac4c374e b1bd1bf19
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:08 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 5 +
 2 files changed, 8 insertions(+)




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

[tor-commits] [tor/maint-0.3.2] Clear the address when node_get_prim_orport() returns early

2017-10-23 Thread nickm

commit 5bca66be497f18b94a85ad8eb836fff5a356627d
Author: teor 
Date:   Sun Oct 15 16:45:15 2017 -0400

Clear the address when node_get_prim_orport() returns early

Fixes bug 23874; bugfix on 0.2.8.2-alpha.
---
 changes/bug23874  | 3 +++
 src/or/nodelist.c | 8 
 2 files changed, 11 insertions(+)

diff --git a/changes/bug23874 b/changes/bug23874
new file mode 100644
index 0..bf6620553
--- /dev/null
+++ b/changes/bug23874
@@ -0,0 +1,3 @@
+  o Minor bugfixes (memory safety):
+- Clear the address when node_get_prim_orport() returns early.
+  Fixes bug 23874; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 070e2e9e0..0e9a65181 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1031,6 +1031,14 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t 
*ap_out)
   node_assert_ok(node);
   tor_assert(ap_out);
 
+  /* Clear the address, as a safety precaution if calling functions ignore the
+   * return value */
+  tor_addr_make_null(_out->addr, AF_INET);
+  ap_out->port = 0;
+
+  /* Check ri first, because rewrite_node_address_for_bridge() updates
+   * node->ri with the configured bridge address. */
+
   RETURN_IPV4_AP(node->ri, or_port, ap_out);
   RETURN_IPV4_AP(node->rs, or_port, ap_out);
   /* Microdescriptors only have an IPv6 address */



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

[tor-commits] [tor/release-0.3.0] Clear the address when node_get_prim_orport() returns early

2017-10-23 Thread nickm

commit 5bca66be497f18b94a85ad8eb836fff5a356627d
Author: teor 
Date:   Sun Oct 15 16:45:15 2017 -0400

Clear the address when node_get_prim_orport() returns early

Fixes bug 23874; bugfix on 0.2.8.2-alpha.
---
 changes/bug23874  | 3 +++
 src/or/nodelist.c | 8 
 2 files changed, 11 insertions(+)

diff --git a/changes/bug23874 b/changes/bug23874
new file mode 100644
index 0..bf6620553
--- /dev/null
+++ b/changes/bug23874
@@ -0,0 +1,3 @@
+  o Minor bugfixes (memory safety):
+- Clear the address when node_get_prim_orport() returns early.
+  Fixes bug 23874; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 070e2e9e0..0e9a65181 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1031,6 +1031,14 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t 
*ap_out)
   node_assert_ok(node);
   tor_assert(ap_out);
 
+  /* Clear the address, as a safety precaution if calling functions ignore the
+   * return value */
+  tor_addr_make_null(_out->addr, AF_INET);
+  ap_out->port = 0;
+
+  /* Check ri first, because rewrite_node_address_for_bridge() updates
+   * node->ri with the configured bridge address. */
+
   RETURN_IPV4_AP(node->ri, or_port, ap_out);
   RETURN_IPV4_AP(node->rs, or_port, ap_out);
   /* Microdescriptors only have an IPv6 address */



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

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

2017-10-23 Thread nickm

commit ebedb5e06f68b102711477997c3e04ccece0e12d
Merge: 602f9565a f0a6ea0bf
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:48 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 5 +
 2 files changed, 8 insertions(+)

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

[tor-commits] [tor/maint-0.3.0] Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9

2017-10-23 Thread nickm

commit b1bd1bf19f7e17a94cefaccb63e5608fda1df4e2
Merge: fcd5c3144 5bca66be4
Author: Nick Mathewson 
Date:   Mon Oct 23 15:53:45 2017 -0400

Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 8 
 2 files changed, 11 insertions(+)



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

[tor-commits] [tor/release-0.3.1] Clear the address when node_get_prim_orport() returns early

2017-10-23 Thread nickm

commit 5bca66be497f18b94a85ad8eb836fff5a356627d
Author: teor 
Date:   Sun Oct 15 16:45:15 2017 -0400

Clear the address when node_get_prim_orport() returns early

Fixes bug 23874; bugfix on 0.2.8.2-alpha.
---
 changes/bug23874  | 3 +++
 src/or/nodelist.c | 8 
 2 files changed, 11 insertions(+)

diff --git a/changes/bug23874 b/changes/bug23874
new file mode 100644
index 0..bf6620553
--- /dev/null
+++ b/changes/bug23874
@@ -0,0 +1,3 @@
+  o Minor bugfixes (memory safety):
+- Clear the address when node_get_prim_orport() returns early.
+  Fixes bug 23874; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 070e2e9e0..0e9a65181 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1031,6 +1031,14 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t 
*ap_out)
   node_assert_ok(node);
   tor_assert(ap_out);
 
+  /* Clear the address, as a safety precaution if calling functions ignore the
+   * return value */
+  tor_addr_make_null(_out->addr, AF_INET);
+  ap_out->port = 0;
+
+  /* Check ri first, because rewrite_node_address_for_bridge() updates
+   * node->ri with the configured bridge address. */
+
   RETURN_IPV4_AP(node->ri, or_port, ap_out);
   RETURN_IPV4_AP(node->rs, or_port, ap_out);
   /* Microdescriptors only have an IPv6 address */



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

[tor-commits] [tor/master] Clear the address when node_get_prim_orport() returns early

2017-10-23 Thread nickm

commit 5bca66be497f18b94a85ad8eb836fff5a356627d
Author: teor 
Date:   Sun Oct 15 16:45:15 2017 -0400

Clear the address when node_get_prim_orport() returns early

Fixes bug 23874; bugfix on 0.2.8.2-alpha.
---
 changes/bug23874  | 3 +++
 src/or/nodelist.c | 8 
 2 files changed, 11 insertions(+)

diff --git a/changes/bug23874 b/changes/bug23874
new file mode 100644
index 0..bf6620553
--- /dev/null
+++ b/changes/bug23874
@@ -0,0 +1,3 @@
+  o Minor bugfixes (memory safety):
+- Clear the address when node_get_prim_orport() returns early.
+  Fixes bug 23874; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 070e2e9e0..0e9a65181 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1031,6 +1031,14 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t 
*ap_out)
   node_assert_ok(node);
   tor_assert(ap_out);
 
+  /* Clear the address, as a safety precaution if calling functions ignore the
+   * return value */
+  tor_addr_make_null(_out->addr, AF_INET);
+  ap_out->port = 0;
+
+  /* Check ri first, because rewrite_node_address_for_bridge() updates
+   * node->ri with the configured bridge address. */
+
   RETURN_IPV4_AP(node->ri, or_port, ap_out);
   RETURN_IPV4_AP(node->rs, or_port, ap_out);
   /* Microdescriptors only have an IPv6 address */



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

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

2017-10-23 Thread nickm

commit b1bd1bf19f7e17a94cefaccb63e5608fda1df4e2
Merge: fcd5c3144 5bca66be4
Author: Nick Mathewson 
Date:   Mon Oct 23 15:53:45 2017 -0400

Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 8 
 2 files changed, 11 insertions(+)



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

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

2017-10-23 Thread nickm

commit f0a6ea0bfd6afaa718c6b3d521a5d195d47ba56d
Merge: af33fdd7c 9ae4ffc07
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:48 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 5 +
 2 files changed, 8 insertions(+)

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

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

2017-10-23 Thread nickm

commit b1bd1bf19f7e17a94cefaccb63e5608fda1df4e2
Merge: fcd5c3144 5bca66be4
Author: Nick Mathewson 
Date:   Mon Oct 23 15:53:45 2017 -0400

Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 8 
 2 files changed, 11 insertions(+)



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

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

2017-10-23 Thread nickm

commit f0a6ea0bfd6afaa718c6b3d521a5d195d47ba56d
Merge: af33fdd7c 9ae4ffc07
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:48 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 5 +
 2 files changed, 8 insertions(+)




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

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

2017-10-23 Thread nickm

commit b1bd1bf19f7e17a94cefaccb63e5608fda1df4e2
Merge: fcd5c3144 5bca66be4
Author: Nick Mathewson 
Date:   Mon Oct 23 15:53:45 2017 -0400

Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 8 
 2 files changed, 11 insertions(+)



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

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

2017-10-23 Thread nickm

commit b1bd1bf19f7e17a94cefaccb63e5608fda1df4e2
Merge: fcd5c3144 5bca66be4
Author: Nick Mathewson 
Date:   Mon Oct 23 15:53:45 2017 -0400

Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 8 
 2 files changed, 11 insertions(+)



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

[tor-commits] [tor/maint-0.3.0] Clear the address when node_get_prim_orport() returns early

2017-10-23 Thread nickm

commit 5bca66be497f18b94a85ad8eb836fff5a356627d
Author: teor 
Date:   Sun Oct 15 16:45:15 2017 -0400

Clear the address when node_get_prim_orport() returns early

Fixes bug 23874; bugfix on 0.2.8.2-alpha.
---
 changes/bug23874  | 3 +++
 src/or/nodelist.c | 8 
 2 files changed, 11 insertions(+)

diff --git a/changes/bug23874 b/changes/bug23874
new file mode 100644
index 0..bf6620553
--- /dev/null
+++ b/changes/bug23874
@@ -0,0 +1,3 @@
+  o Minor bugfixes (memory safety):
+- Clear the address when node_get_prim_orport() returns early.
+  Fixes bug 23874; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 070e2e9e0..0e9a65181 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1031,6 +1031,14 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t 
*ap_out)
   node_assert_ok(node);
   tor_assert(ap_out);
 
+  /* Clear the address, as a safety precaution if calling functions ignore the
+   * return value */
+  tor_addr_make_null(_out->addr, AF_INET);
+  ap_out->port = 0;
+
+  /* Check ri first, because rewrite_node_address_for_bridge() updates
+   * node->ri with the configured bridge address. */
+
   RETURN_IPV4_AP(node->ri, or_port, ap_out);
   RETURN_IPV4_AP(node->rs, or_port, ap_out);
   /* Microdescriptors only have an IPv6 address */



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

[tor-commits] [tor/maint-0.3.1] Clear the address when node_get_prim_orport() returns early

2017-10-23 Thread nickm

commit 5bca66be497f18b94a85ad8eb836fff5a356627d
Author: teor 
Date:   Sun Oct 15 16:45:15 2017 -0400

Clear the address when node_get_prim_orport() returns early

Fixes bug 23874; bugfix on 0.2.8.2-alpha.
---
 changes/bug23874  | 3 +++
 src/or/nodelist.c | 8 
 2 files changed, 11 insertions(+)

diff --git a/changes/bug23874 b/changes/bug23874
new file mode 100644
index 0..bf6620553
--- /dev/null
+++ b/changes/bug23874
@@ -0,0 +1,3 @@
+  o Minor bugfixes (memory safety):
+- Clear the address when node_get_prim_orport() returns early.
+  Fixes bug 23874; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 070e2e9e0..0e9a65181 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1031,6 +1031,14 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t 
*ap_out)
   node_assert_ok(node);
   tor_assert(ap_out);
 
+  /* Clear the address, as a safety precaution if calling functions ignore the
+   * return value */
+  tor_addr_make_null(_out->addr, AF_INET);
+  ap_out->port = 0;
+
+  /* Check ri first, because rewrite_node_address_for_bridge() updates
+   * node->ri with the configured bridge address. */
+
   RETURN_IPV4_AP(node->ri, or_port, ap_out);
   RETURN_IPV4_AP(node->rs, or_port, ap_out);
   /* Microdescriptors only have an IPv6 address */



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

[tor-commits] [tor-browser-build/master] Bug 23384: Add user brade on build-sunet-a.torproject.net

2017-10-23 Thread boklm

commit eec1680facf5b805e8860daa70602ab6b43272aa
Author: Nicolas Vigier 
Date:   Mon Oct 23 21:00:18 2017 +0200

Bug 23384: Add user brade on build-sunet-a.torproject.net
---
 tools/ansible/roles/tbb-team/defaults/main.yml | 1 +
 tools/ansible/roles/tbb-team/files/brade.pub   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml 
b/tools/ansible/roles/tbb-team/defaults/main.yml
index fff2def..cf54157 100644
--- a/tools/ansible/roles/tbb-team/defaults/main.yml
+++ b/tools/ansible/roles/tbb-team/defaults/main.yml
@@ -1,5 +1,6 @@
 ---
 tbb_team_members:
 - boklm
+- brade
 - gk
 - mcs
diff --git a/tools/ansible/roles/tbb-team/files/brade.pub 
b/tools/ansible/roles/tbb-team/files/brade.pub
new file mode 100644
index 000..0a83b4d
--- /dev/null
+++ b/tools/ansible/roles/tbb-team/files/brade.pub
@@ -0,0 +1 @@
+ssh-rsa 
B3NzaC1yc2EDAQABAAABAQC+p9eNuVj59oHkPe/uM+DFTchAxMsm1F6jsMMQqzcNd2sIVAxftMEu8OTM5/rdz+XemevzE+BYHhNUamW/05rur97AYJB7hsOYBtx0g9tGx/2zot72yU38TjmbhWE1FKct+9zc6ZQnYHXLtWBB6k/zJeQH2CvwDLrHsXxfUvOE9lXrcgFy1ugVC96EknBfqz5LTG2dsQhn+nzpEnb3IZYoaRc0h33BVGLkNyFQEtm+7JzylTX6/854kk1BqwZLl03U6++7XA4SjVOYPCM3K1++dJt3CwnARs7mR3t03FFUj0gyRoPuxB6iwPtaCDIDEhSOMmj8hfbFu1N4jm4XY1H3

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

[tor-commits] [tor-browser-build/master] Bug 23899: use tmp_dir from rbm.conf in update_responses

2017-10-23 Thread gk

commit c64f614475954951619856f58e06f7890ff9fef2
Author: Nicolas Vigier 
Date:   Mon Oct 23 19:30:40 2017 +0200

Bug 23899: use tmp_dir from rbm.conf in update_responses
---
 projects/release/update_responses_config.yml |  1 +
 tools/update-responses/update_responses  | 23 +++
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/projects/release/update_responses_config.yml 
b/projects/release/update_responses_config.yml
index 69d8909..8d945dc 100644
--- a/projects/release/update_responses_config.yml
+++ b/projects/release/update_responses_config.yml
@@ -1,4 +1,5 @@
 ---
+tmp_dir: '[% c("tmp_dir") %]'
 appname_marfile: tor-browser
 appname_bundle_osx: TorBrowser
 appname_bundle_linux: tor-browser
diff --git a/tools/update-responses/update_responses 
b/tools/update-responses/update_responses
index 0ed19c1..9303ed1 100755
--- a/tools/update-responses/update_responses
+++ b/tools/update-responses/update_responses
@@ -41,6 +41,13 @@ sub exit_error {
 exit (exists $_[1] ? $_[1] : 1);
 }
 
+sub get_tmpdir {
+my ($config) = @_;
+return File::Temp->newdir($config->{tmp_dir} ?
+(DIR => $config->{tmp_dir})
+: ());
+}
+
 sub build_targets_by_os {
 return ($_[0]) unless $config->{build_targets}{$_[0]};
 my $r = $config->{build_targets}{$_[0]};
@@ -197,7 +204,7 @@ sub create_incremental_mar {
 };
 };
 return if $pm->start($finished_file);
-my $tmpdir = File::Temp->newdir();
+my $tmpdir = get_tmpdir($config);
 extract_mar(mar_filename($appname, $from_version, $os, $lang), 
"$tmpdir/A");
 extract_mar(mar_filename($appname, $new_version, $os, $lang), "$tmpdir/B");
 if ($ENV{CHECK_CODESIGNATURE_EXISTS}) {
@@ -254,12 +261,12 @@ sub channel_to_version {
 sub get_buildinfos {
 my ($config, $version) = @_;
 return if exists $config->{versions}{$version}{buildID};
-extract_martools($version);
+extract_martools($config, $version);
 my $files = $config->{versions}{$version}{files};
 foreach my $os (keys %$files) {
 foreach my $lang (keys %{$files->{$os}}) {
 next unless $files->{$os}{$lang}{complete};
-my $tmpdir = File::Temp->newdir();
+my $tmpdir = get_tmpdir($config);
 extract_mar(
 mar_filename($config->{appname_marfile}, $version, $os, $lang),
 "$tmpdir");
@@ -412,10 +419,10 @@ sub osname {
 
 my $martools_tmpdir;
 sub extract_martools {
-my ($version) = @_;
+my ($config, $version) = @_;
 my $osname = osname;
 my $marzip = "$releases_dir/$version/mar-tools-$osname.zip";
-$martools_tmpdir = File::Temp->newdir();
+$martools_tmpdir = get_tmpdir($config);
 my $old_cwd = getcwd;
 chdir $martools_tmpdir;
 my (undef, undef, $success) = capture_exec('unzip', $marzip);
@@ -513,7 +520,7 @@ sub check_update_responses_channel {
 
 sub download_version {
 my ($config, $version) = @_;
-my $tmpdir = File::Temp->newdir();
+my $tmpdir = get_tmpdir($config);
 my $destdir = "$releases_dir/$version";
 my $urldir = "$config->{download}{archive_url}/$version";
 print "Downloading version $version\n";
@@ -548,7 +555,7 @@ sub download_version {
 unless $sums{$martools} eq sha256_hex(read_file("$tmpdir/$martools"));
 move "$tmpdir/$martools", "$destdir/$martools";
 move "$tmpdir/$martools.asc", "$destdir/$martools.asc";
-extract_martools($version);
+extract_martools($config, $version);
 
 foreach my $file (sort grep { $_ =~ m/\.mar$/ } keys %sums) {
 print "Downloading $file\n";
@@ -619,7 +626,7 @@ my %actions = (
 gen_incrementals => sub {
 my ($config) = @_;
 foreach my $version (channel_to_version($config, @ARGV)) {
-extract_martools($version);
+extract_martools($config, $version);
 get_version_files($config, $version);
 create_incremental_mars_for_version($config, $version);
 }

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

[tor-commits] [nyx/master] Add arrow image

2017-10-23 Thread atagar

commit 66e3df733746a81b7d9b51f879446ceddc9f9bc7
Author: Damian Johnson 
Date:   Mon Oct 23 10:17:32 2017 -0700

Add arrow image

Oops! Forgot to add a couple small image resources.
---
 web/images/down_arrow_brown.png | Bin 0 -> 233 bytes
 web/images/down_arrow_white.png | Bin 0 -> 229 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/web/images/down_arrow_brown.png b/web/images/down_arrow_brown.png
new file mode 100644
index 000..850165c
Binary files /dev/null and b/web/images/down_arrow_brown.png differ
diff --git a/web/images/down_arrow_white.png b/web/images/down_arrow_white.png
new file mode 100644
index 000..cd5dcf2
Binary files /dev/null and b/web/images/down_arrow_white.png differ

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

[tor-commits] [nyx/master] Website menu with less common pages

2017-10-23 Thread atagar

commit 3561486591f43d45b295395765568acf01f8c08c
Author: Damian Johnson 
Date:   Sun Oct 22 15:57:33 2017 -0700

Website menu with less common pages

When looking at our site I just realized it's hard to figure out how to 
report
bugs. It's in the FAQ, but who's gonna read that?

Adding a 'more' dropdown menu with useful, but less common sections folks 
will
want (changelog, bug tracker, and contact info for now). The contact page
doesn't exist yet - that's next.

God the styling on this was a pita. I'm really not sure why this negative
margin is necessary but without it the rest of the nav menu gets pushed 
down.
Stared for hours at this hoping to get something simpler but time to raise 
the
flag and commit what works.

I really hate the lack of a shared header, but can't say that alone is worth
something like Hyde. :/
---
 web/changelog/index.html  | 13 +
 web/changelog/legacy.html | 13 +
 web/index.html| 13 +
 web/styles.css| 69 ++-
 4 files changed, 107 insertions(+), 1 deletion(-)

diff --git a/web/changelog/index.html b/web/changelog/index.html
index 163f742..5740aba 100644
--- a/web/changelog/index.html
+++ b/web/changelog/index.html
@@ -12,6 +12,19 @@
 
   
 
+
+
+
+
+  
+Changelog
+https://trac.torproject.org/projects/tor/wiki/doc/nyx/bugs;>Bug 
Tracker
+Contact
+  
+
+
+
+
 
   
 What Is It?
diff --git a/web/changelog/legacy.html b/web/changelog/legacy.html
index 17f00c3..b758c8f 100644
--- a/web/changelog/legacy.html
+++ b/web/changelog/legacy.html
@@ -12,6 +12,19 @@
 
   
 
+
+
+
+
+  
+Changelog
+https://trac.torproject.org/projects/tor/wiki/doc/nyx/bugs;>Bug 
Tracker
+Contact
+  
+
+
+
+
 
   
 What Is It?
diff --git a/web/index.html b/web/index.html
index 06284ce..c26f43a 100644
--- a/web/index.html
+++ b/web/index.html
@@ -16,6 +16,19 @@
 
   
 
+
+
+
+
+  
+Changelog
+https://trac.torproject.org/projects/tor/wiki/doc/nyx/bugs;>Bug 
Tracker
+Contact
+  
+
+
+
+
 
   
 What Is It?
diff --git a/web/styles.css b/web/styles.css
index fd92867..276756b 100644
--- a/web/styles.css
+++ b/web/styles.css
@@ -54,7 +54,7 @@ Header Bar (logo and nav)
   display: inline;
 }
 
-.nav a { 
+.nav a {
   background: #825d27;
   border: 1px solid #47351c;
   border-bottom-right-radius: 7px;
@@ -87,6 +87,73 @@ Header Bar (logo and nav)
   color: #66;
 }
 
+#more {
+  background: #825d27 url("images/down_arrow_white.png") no-repeat;
+  background-position: center;
+  border: 1px solid #47351c;
+  border-bottom-right-radius: 7px;
+  border-bottom-left-radius: 7px;
+  border-top: none;
+  float: right;
+  height: 29px;
+  margin-left: 3px;
+  width: 25px;
+}
+
+#more:hover {
+  background: #ff url("images/down_arrow_brown.png") no-repeat;
+  background-position: center;
+  border: 1px solid #885CA4;
+  border-top: none;
+}
+
+#more-menu {
+  float: right;
+  margin-top: 30px;
+  display: none;
+  text-align: left;
+}
+
+#more:hover #more-menu {
+  display: block; /* show the menu when hoving over the arrow */
+}
+
+#more-menu li {
+  background: #825d27;
+  border: 1px solid #47351c;
+  border-bottom: none;
+  border-top: none;
+  display: inline-block;
+  padding-left: 10px;
+  width: 125px;
+}
+
+#more-menu li:hover {
+  background: #ff;
+}
+
+#more-menu a {
+  color: #fafafa;
+  display: block;
+  font-weight: normal;
+  padding-bottom: 4px;
+  padding-top: 4px;
+}
+
+#more-menu li:hover a {
+  color: #00;
+}
+
+#more-menu li:first-child {
+  border-top-right-radius: 7px;
+  border-top-left-radius: 7px;
+}
+
+#more-menu li:last-child {
+  border-bottom-right-radius: 7px;
+  border-bottom-left-radius: 7px;
+}
+
 /*
 Common Page Attributes
 */



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

[tor-commits] [nyx/master] Add a contact webpage

2017-10-23 Thread atagar

commit f55b0c25b9f5b6a6803591686dc69ae60d253e4b
Author: Damian Johnson 
Date:   Mon Oct 23 10:08:32 2017 -0700

Add a contact webpage

Simple page listing our relay support channels (email list, irc, trac, and 
me).
---
 web/index.html | 29 +
 1 file changed, 29 insertions(+)

diff --git a/web/index.html b/web/index.html
index c26f43a..a0e4591 100644
--- a/web/index.html
+++ b/web/index.html
@@ -34,6 +34,7 @@
 What Is It?
 FAQ
 Download
+Contact
   
 
   
@@ -416,6 +417,33 @@ sudo python setup.py install
   
 
 
+
+  
+  Contact
+
+  Issues? Feedback? Tor has a few support forums for relay 
operators...
+
+  
+
+  
+https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays;>Email
+  https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays;>tor-relays@
 is a list of relay operators for relay operators. System administration 
question? Tips for handling an abuse complaint? Then this is the place for 
you.
+
+
+https://www.torproject.org/about/contact.html.en#irc;>IRC
+  Need real-time help? Give OFTC's https://www.torproject.org/about/contact.html.en#irc;>#tor channel a 
try.
+
+
+https://trac.torproject.org/projects/tor/wiki/doc/nyx/bugs;>Bug 
Tracker
+  Nyx glitch? Stacktrace? To report technical problems drop us a 
line on our https://trac.torproject.org/projects/tor/wiki/doc/nyx/bugs;>bug 
tracker.
+
+
+https://www.atagar.com/contact/;>Author
+  Got general feedback or a feature idea you'd like to float? https://www.atagar.com/contact/;>Let me know!
+
+  
+
+

[tor-commits] [nyx/master] Manually handle caching of connections

2017-10-23 Thread atagar

commit 964e9a7afb7acee0351c7ba23579b5b5efdf640b
Author: Damian Johnson 
Date:   Sun Oct 22 10:38:35 2017 -0700

Manually handle caching of connections

Connections shouldn't use a lru_cache. If the cache size is less than the
number of connections we have at any point then we consume extra cpu, but if
it's too high we consume more and more memory unnecessarily until it's 
filled.

Instead evicting from the cache when a connection hasn't been referenced in 
a
while.
---
 nyx/panel/connection.py | 35 +--
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py
index 9b3279c..3fe283b 100644
--- a/nyx/panel/connection.py
+++ b/nyx/panel/connection.py
@@ -23,12 +23,6 @@ from nyx.menu import MenuItem, Submenu, RadioMenuItem, 
RadioGroup
 from stem.control import Listener
 from stem.util import datetime_to_unix, conf, connection, enum, str_tools
 
-try:
-  # added in python 3.2
-  from functools import lru_cache
-except ImportError:
-  from stem.util.lru_cache import lru_cache
-
 # height of the detail panel content, not counting top and bottom border
 
 DETAILS_HEIGHT = 7
@@ -41,6 +35,9 @@ UPDATE_RATE = 5  # rate in seconds at which we refresh
 LAST_RETRIEVED_HS_CONF = None
 LAST_RETRIEVED_CIRCUITS = None
 
+ENTRY_CACHE = {}
+ENTRY_CACHE_REFERENCED = {}
+
 # Connection Categories:
 #   Inbound  Relay connection, coming to us.
 #   Outbound Relay connection, leaving us.
@@ -82,14 +79,20 @@ CONFIG = conf.config_dict('nyx', {
 
 class Entry(object):
   @staticmethod
-  @lru_cache(maxsize = 1)
   def from_connection(connection):
-return ConnectionEntry(connection)
+if connection not in ENTRY_CACHE:
+  ENTRY_CACHE[connection] = ConnectionEntry(connection)
+
+ENTRY_CACHE_REFERENCED[connection] = time.time()
+return ENTRY_CACHE[connection]
 
   @staticmethod
-  @lru_cache()
   def from_circuit(circuit):
-return CircuitEntry(circuit)
+if circuit not in ENTRY_CACHE:
+  ENTRY_CACHE[circuit] = CircuitEntry(circuit)
+
+ENTRY_CACHE_REFERENCED[circuit] = time.time()
+return ENTRY_CACHE[circuit]
 
   def __init__(self):
 self._lines = None
@@ -551,6 +554,18 @@ class ConnectionPanel(nyx.panel.DaemonPanel):
 
   nyx.tracker.get_port_usage_tracker().query(local_ports, remote_ports)
 
+# clear cache of anything that hasn't been referenced in the last five 
minutes
+
+now = time.time()
+to_clear = [k for k, v in ENTRY_CACHE_REFERENCED.items() if (now - v) >= 
300]
+
+for entry in to_clear:
+  for cache in (ENTRY_CACHE, ENTRY_CACHE_REFERENCED):
+try:
+  del cache[entry]
+except KeyError:
+  pass
+
 self.redraw()
 
 



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

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

2017-10-23 Thread translation

commit b1bed2c55dadc8a08c827f191f71ea2fd910ae8f
Author: Translation commit bot 
Date:   Mon Oct 23 16:21:04 2017 +

Update translations for exoneratorproperties
---
 nn/exonerator.properties | 34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/nn/exonerator.properties b/nn/exonerator.properties
index 0c4d66fcd..8cf7400bd 100644
--- a/nn/exonerator.properties
+++ b/nn/exonerator.properties
@@ -1,4 +1,4 @@
-form.explanation=Enter an IP address and date to find out whether that address 
was used as a Tor relay:
+form.explanation=Skriv inn ei IP-addresse og dato for Ã¥ finne ut om adressa 
var brukt som eit Tor-relae-relÃ©:
 form.ip.label=IP-addresse
 form.timestamp.label=Dato
 form.search.label=SÃ¸k
@@ -10,43 +10,43 @@ summary.serverproblem.dbempty.title=Tenarproblem
 summary.serverproblem.dbempty.body.text=Databasen ser ut til Ã¥ veree tom. 
PrÃ¸v igjen seinare. Om problemet fortset, gjer vel og %s!
 summary.serverproblem.dbempty.body.link=informer oss
 summary.invalidparams.notimestamp.title=Ingen dataparameter gjevne
-summary.invalidparams.notimestamp.body=Sorry, you also need to provide a date 
parameter.
+summary.invalidparams.notimestamp.body=Beklagar, du mÃ¥ Ã²g skrive inn eit 
dato-paramenter.
 summary.invalidparams.noip.title=Ikkje noko IP-adresseparameter gjeve
 summary.invalidparams.noip.body=Beklagar, du mÃ¥ gje opp eit 
IP-addresseparameter.
 summary.invalidparams.timestamprange.title=Dataparameter ute av rerkkjevidde
-summary.invalidparams.timestamprange.body=Sorry, the database does not contain 
any data from %s. Please pick a date between %s and %s.
+summary.invalidparams.timestamprange.body=Beklagar, databasen inneheld ingen 
data frÃ¥ %s. Vel ein dato mellom %s og %s.
 summary.invalidparams.invalidip.title=Ugyldig IP-addresseparameter
-summary.invalidparams.invalidip.body=Sorry, %s is not a valid IP address. The 
expected IP address formats are %s or %s.
+summary.invalidparams.invalidip.body=Beklagar, %s er ikkje ei gyldig 
IP-adresse. Forventa IP-adresseformat er %s eller %s.
 summary.invalidparams.invalidtimestamp.title=Ugyldig dataparameter
-summary.invalidparams.invalidtimestamp.body=Sorry, %s is not a valid date. The 
expected date format is %s.
+summary.invalidparams.invalidtimestamp.body=Beklagar, %s er ikkje ein gyldig 
dato. Forventa dataformat er %s.
 summary.serverproblem.nodata.title=Tenarproblem
-summary.serverproblem.nodata.body.text=The database does not contain any data 
for the requested date. Please try again later. If this problem persists, 
please %s!
+summary.serverproblem.nodata.body.text=Databasen inneheld ingen data for den 
fÃ¸respurde datoen. PrÃ¸v pÃ¥ nytt seinare. Om dette problemet fortset, ver 
snill og %s!
 summary.serverproblem.nodata.body.link=informer oss
-summary.negativesamenetwork.title=Result is negative
+summary.negativesamenetwork.title=Negativt resultat
 summary.negativesamenetwork.body=We did not find IP address %s on or within a 
day of %s. But we did find other IP addresses of Tor relays in the same /%d 
network around the time:
-summary.positive.title=Result is positive
+summary.positive.title=Positivt resultat
 summary.positive.body=We found one or more Tor relays on IP address %s on or 
within a day of %s that Tor clients were likely to know.
-summary.negative.title=Result is negative
+summary.negative.title=Negativt resultat
 summary.negative.body=We did not find IP address %s on or within a day of %s.
-technicaldetails.heading=Technical details
+technicaldetails.heading=Tekniske detaljar
 technicaldetails.pre=Looking up IP address %s on or within one day of %s. Tor 
clients could have selected this or these Tor relays to build circuits.
-technicaldetails.colheader.timestamp=Timestamp (UTC)
+technicaldetails.colheader.timestamp=Tidsstempel (UTC)
 technicaldetails.colheader.ip=IP-addresse(r)
-technicaldetails.colheader.fingerprint=Identity fingerprint
+technicaldetails.colheader.fingerprint=Identitetsfingeravtrykk
 technicaldetails.colheader.nickname=Kallenamn
-technicaldetails.colheader.exit=Exit relay
+technicaldetails.colheader.exit=Exit-relÃ©
 technicaldetails.nickname.unknown=Ukjend
 technicaldetails.exit.unknown=Ukjend
 technicaldetails.exit.yes=Ja
 technicaldetails.exit.no=Nei
-permanentlink.heading=Permanent link
+permanentlink.heading=Permanent lenke
 footer.abouttor.heading=Om Tor
 footer.abouttor.body.text=Tor is an international software project to 
anonymize Internet traffic by %s. Therefore, if you see traffic from a 
Tor relay, this traffic usually originates from someone using Tor, rather than 
from the relay operator. The Tor Project and Tor relay operators have no 
records of the traffic that passes over the network and therefore cannot 
provide any information about its origin. Be sure to %s, and don't 
hesitate to %s for more information.
 footer.abouttor.body.link1=encrypting packets and sending them through a 
series of hops before they

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

2017-10-23 Thread translation

commit aa871b321d49830cd0beea946c786732bd94f961
Author: Translation commit bot 
Date:   Mon Oct 23 16:15:23 2017 +

Update translations for torcheck_completed
---
 nn/torcheck.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nn/torcheck.po b/nn/torcheck.po
index cf29ac19f..3cfeca305 100644
--- a/nn/torcheck.po
+++ b/nn/torcheck.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2017-09-19 19:57+\n"
+"PO-Revision-Date: 2017-10-23 16:02+\n"
 "Last-Translator: Finn Brudal \n"
 "Language-Team: Norwegian Nynorsk 
(http://www.transifex.com/otf/torproject/language/nn/)\n"
 "MIME-Version: 1.0\n"

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

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

2017-10-23 Thread translation

commit 5794c3d0282b529b7456cf03e6e3fcafce8f1ee4
Author: Translation commit bot 
Date:   Mon Oct 23 16:15:17 2017 +

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

diff --git a/nn/torcheck.po b/nn/torcheck.po
index cf29ac19f..3cfeca305 100644
--- a/nn/torcheck.po
+++ b/nn/torcheck.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2017-09-19 19:57+\n"
+"PO-Revision-Date: 2017-10-23 16:02+\n"
 "Last-Translator: Finn Brudal \n"
 "Language-Team: Norwegian Nynorsk 
(http://www.transifex.com/otf/torproject/language/nn/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd

2017-10-23 Thread translation

commit a94c7d7f172fca438e67d9f896a98e52cb52ccdb
Author: Translation commit bot 
Date:   Mon Oct 23 15:50:22 2017 +

Update translations for tor-messenger-prefsdtd
---
 nn/prefs.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nn/prefs.dtd b/nn/prefs.dtd
index b83c75082..216acc5e4 100644
--- a/nn/prefs.dtd
+++ b/nn/prefs.dtd
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 
 
@@ -19,4 +19,4 @@
 
 
 
-
\ No newline at end of file
+
\ No newline at end of file

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

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

2017-10-23 Thread translation

commit 242df403923983a64f2a26bfee125152a8a41cc2
Author: Translation commit bot 
Date:   Mon Oct 23 15:48:55 2017 +

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

diff --git a/nn/aboutdialog.dtd b/nn/aboutdialog.dtd
new file mode 100644
index 0..8407bbe02
--- /dev/null
+++ b/nn/aboutdialog.dtd
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

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

2017-10-23 Thread translation

commit 38c3cf920fec5ccba951f9698e577282cd9530e5
Author: Translation commit bot 
Date:   Mon Oct 23 15:49:02 2017 +

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

diff --git a/nn/abouttor.properties b/nn/abouttor.properties
index b1b65197a..5f5eb077d 100644
--- a/nn/abouttor.properties
+++ b/nn/abouttor.properties
@@ -8,13 +8,13 @@ 
aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
-aboutTor.donationBanner.donate=Donate Now!
+aboutTor.donationBanner.donate=Doner no!
 
 aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance
 aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift!
 
 aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & 
Activists Since 2006
-aboutTor.donationBanner.tagline2=Networking Freedom Worldwide
-aboutTor.donationBanner.tagline3=Freedom Online
+aboutTor.donationBanner.tagline2=Nettverksfriheit verda over
+aboutTor.donationBanner.tagline3=Friheit pÃ¥ nettet
 aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide
-aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day
+aboutTor.donationBanner.tagline5=Beskyttar personvernet for millionar kvar dag

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

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

2017-10-23 Thread translation

commit b0face6f2ea88db2153a5f9992974aecd331da5e
Author: Translation commit bot 
Date:   Mon Oct 23 15:48:50 2017 +

Update translations for torbutton-aboutdialogdtd
---
 nn/aboutdialog.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nn/aboutdialog.dtd b/nn/aboutdialog.dtd
index 0f04194d4..8407bbe02 100644
--- a/nn/aboutdialog.dtd
+++ b/nn/aboutdialog.dtd
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
 
@@ -16,4 +16,4 @@
 
 
 
-
+

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

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

2017-10-23 Thread translation

commit 134899726e54645e9fa9c02bef7568153731f799
Author: Translation commit bot 
Date:   Mon Oct 23 15:48:19 2017 +

Update translations for tails-perl5lib
---
 nn.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nn.po b/nn.po
index 221e2e4d7..5de33f5c9 100644
--- a/nn.po
+++ b/nn.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# BjÃ¸rn I. , 2014,2016
+# BjÃ¸rn I. , 2014,2016-2017
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2017-05-20 10:59+0200\n"
-"PO-Revision-Date: 2017-09-19 22:59+\n"
+"PO-Revision-Date: 2017-10-23 15:40+\n"
 "Last-Translator: BjÃ¸rn I. \n"
 "Language-Team: Norwegian Nynorsk 
(http://www.transifex.com/otf/torproject/language/nn/)\n"
 "MIME-Version: 1.0\n"
@@ -32,4 +32,4 @@ msgstr "Klarte ikkje Ã¥ finna eininga som Tails kÃ¸yrer frÃ¥. 
Kanskje du nytta `
 msgid ""
 "The drive Tails is running from cannot be found. Maybe you used the `toram' "
 "option?"
-msgstr ""
+msgstr "Finn ikkje lagringseininga Tails kÃ¸yrer frÃ¥. \nKanskje du brukte 
`toram'-valet?"

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

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

2017-10-23 Thread translation

commit d6c1dad171093e0aa5676ce2ba89f79cad9120bb
Author: Translation commit bot 
Date:   Mon Oct 23 15:47:57 2017 +

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

diff --git a/nn/torbutton.properties b/nn/torbutton.properties
index af4f77da6..b3ce07507 100644
--- a/nn/torbutton.properties
+++ b/nn/torbutton.properties
@@ -44,8 +44,8 @@ canvas.neverAccessKey=e
 
 # Profile/startup error messages. Strings are kept here for ease of 
translation.
 # LOCALIZATION NOTE: %S is the application name.
-profileProblemTitle=%S Profile Problem
+profileProblemTitle=%S Profilproblem
 profileReadOnly=You cannot run %S from a read-only file system.  Please copy 
%S to another location before trying to use it.
 profileReadOnlyMac=You cannot run %S from a read-only file system.  Please 
copy %S to your Desktop or Applications folder before trying to use it.
 profileAccessDenied=%S does not have permission to access the profile. Please 
adjust your file system permissions and try again.
-profileMigrationFailed=Migration of your existing %S profile failed.\nNew 
settings will be used.
+profileMigrationFailed=Mislykka migrasjon av den eksisterande profilen 
%S.\nNye instillingar vil bli brukt.

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

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

2017-10-23 Thread translation

commit 4eb103bd99cf4a5eaf22f79bb0b5948cad6e02f9
Author: Translation commit bot 
Date:   Mon Oct 23 15:48:25 2017 +

Update translations for tails-perl5lib_completed
---
 nn.po | 20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/nn.po b/nn.po
index b922e0b76..5de33f5c9 100644
--- a/nn.po
+++ b/nn.po
@@ -3,23 +3,33 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# BjÃ¸rn I. , 2014
+# BjÃ¸rn I. , 2014,2016-2017
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2014-06-24 11:37+0200\n"
-"PO-Revision-Date: 2014-08-18 19:31+\n"
+"POT-Creation-Date: 2017-05-20 10:59+0200\n"
+"PO-Revision-Date: 2017-10-23 15:40+\n"
 "Last-Translator: BjÃ¸rn I. \n"
-"Language-Team: Norwegian Nynorsk 
(http://www.transifex.com/projects/p/torproject/language/nn/)\n"
+"Language-Team: Norwegian Nynorsk 
(http://www.transifex.com/otf/torproject/language/nn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/Tails/RunningSystem.pm:153
+#: ../lib/Tails/RunningSystem.pm:159
+msgid "Error"
+msgstr "Feil"
+
+#: ../lib/Tails/RunningSystem.pm:161
 msgid ""
 "The device Tails is running from cannot be found. Maybe you used the `toram'"
 " option?"
 msgstr "Klarte ikkje Ã¥ finna eininga som Tails kÃ¸yrer frÃ¥. Kanskje du nytta 
`toram'  ved oppstart?"
+
+#: ../lib/Tails/RunningSystem.pm:192
+msgid ""
+"The drive Tails is running from cannot be found. Maybe you used the `toram' "
+"option?"
+msgstr "Finn ikkje lagringseininga Tails kÃ¸yrer frÃ¥. \nKanskje du brukte 
`toram'-valet?"

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

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

2017-10-23 Thread translation

commit 4c99e72a6dc3afe91cf80f12d3cd089cb06396bb
Author: Translation commit bot 
Date:   Mon Oct 23 15:47:21 2017 +

Update translations for tails-misc_completed
---
 nn.po | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/nn.po b/nn.po
index 69b3e1b76..cab4757cf 100644
--- a/nn.po
+++ b/nn.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# BjÃ¸rn I. , 2014-2016
+# BjÃ¸rn I. , 2014-2017
 # Finn Brudal , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-05 11:57+0200\n"
-"PO-Revision-Date: 2017-05-26 14:47+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2017-09-13 20:10+0200\n"
+"PO-Revision-Date: 2017-10-23 15:36+\n"
+"Last-Translator: BjÃ¸rn I. \n"
 "Language-Team: Norwegian Nynorsk 
(http://www.transifex.com/otf/torproject/language/nn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -334,3 +334,7 @@ msgstr "Utrygg nettlesar"
 #: 
../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2
 msgid "Tails specific tools"
 msgstr "Verkty som gjeld Halar"
+
+#: 
../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.root-terminal.policy.in.h:1
+msgid "To start a Root Terminal, you need to authenticate."
+msgstr "For Ã¥ starte ein Root Terminal, mÃ¥ du stadfeste identiteten."

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

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

2017-10-23 Thread translation

commit 8e135edbb68d3c682c420fd989936a5850a38f37
Author: Translation commit bot 
Date:   Mon Oct 23 15:47:14 2017 +

Update translations for tails-misc
---
 nn.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nn.po b/nn.po
index 5a3f608e4..cab4757cf 100644
--- a/nn.po
+++ b/nn.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# BjÃ¸rn I. , 2014-2016
+# BjÃ¸rn I. , 2014-2017
 # Finn Brudal , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-13 20:10+0200\n"
-"PO-Revision-Date: 2017-09-19 19:57+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2017-10-23 15:36+\n"
+"Last-Translator: BjÃ¸rn I. \n"
 "Language-Team: Norwegian Nynorsk 
(http://www.transifex.com/otf/torproject/language/nn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -337,4 +337,4 @@ msgstr "Verkty som gjeld Halar"
 
 #: 
../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.root-terminal.policy.in.h:1
 msgid "To start a Root Terminal, you need to authenticate."
-msgstr ""
+msgstr "For Ã¥ starte ein Root Terminal, mÃ¥ du stadfeste identiteten."

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

[tor-commits] [tor-messenger-build/master] Start bump to ESR 52.4.1

2017-10-23 Thread arlo

commit 659f95c8034530bdf5e1f1c5541ae348f55591cb
Author: Arlo Breault 
Date:   Mon Oct 23 11:16:12 2017 -0400

Start bump to ESR 52.4.1
---
 ChangeLog   |  4 ++--
 .../instantbird/0001-Set-Tor-Messenger-preferences.patch| 13 ++---
 .../0002-Trac-21634-Autologin-default-should-be-false.patch |  4 ++--
 projects/instantbird/0003-XMPP-in-band-registration.patch   |  4 ++--
 projects/instantbird/0004-Remove-search-from-UI.patch   |  4 ++--
 projects/instantbird/0005-Add-Tor-Messenger-branding.patch  |  4 ++--
 ...0006-Remove-option-for-configuring-account-picture.patch |  4 ++--
 .../instantbird/0007-Modify-top-protocol-defaults.patch |  4 ++--
 projects/instantbird/0008-Modify-IRC-defaults.patch |  4 ++--
 .../instantbird/0009-Do-not-set-default-XMPP-server.patch   |  4 ++--
 projects/instantbird/0010-Modify-themes.patch   |  4 ++--
 projects/instantbird/0011-Remove-logging-UI.patch   |  4 ++--
 projects/instantbird/0012-Cert-override.patch   |  4 ++--
 .../instantbird/0013-Display-all-traffic-over-Tor.patch |  4 ++--
 projects/instantbird/0014-Trac-17480-Content-sink.patch |  4 ++--
 .../instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch|  4 ++--
 ...g-1321641-Use-built-in-functions-instead-of-an-svg.patch |  4 ++--
 ...g-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch |  4 ++--
 ...8-Trac-17517-Use-different-color-for-Add-Exception.patch |  4 ++--
 ...019-Trac-21736-Hide-account-timestamp-from-message.patch |  6 +++---
 ...date-allowed-duplicated-files-for-Windows-and-Linu.patch |  4 ++--
 .../0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch  |  4 ++--
 .../0022-Bug-16606-Automatic-XMPP-accounts.patch|  4 ++--
 .../mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch |  4 ++--
 projects/mozilla/0002-Trac-16475-Block-flash-too.patch  |  4 ++--
 projects/mozilla/0003-OSX-package-as-tar.bz2.patch  |  4 ++--
 projects/mozilla/0004-Updater-fixups-for-TM.patch   |  4 ++--
 ...rmit-storing-exceptions-even-w-inPrivateBrowsingMo.patch |  4 ++--
 projects/mozilla/config |  2 +-
 projects/tor-browser/config |  2 +-
 30 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 16921c1..113cebd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
 Tor Messenger 0.5.0b2 --
  * All Platforms
-   * Use the tor-browser-52.4.0esr-7.0-1-build1 tag on tor-browser
+   * Use the tor-browser-52.4.1esr-7.0-1-build1 tag on tor-browser
* Use the THUNDERBIRD_52_4_0_RELEASE tag on comm-esr52
-   * Update tor-browser to 7.0.6
+   * Update tor-browser to 7.0.7
* Update tor-browser-build to 9b4ba82
  * Linux
* Trac 23806: libotr.so and libgcrypt.so are using RPATH
diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch 
b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
index a62853e..fe7b455 100644
--- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
+++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
@@ -1,14 +1,14 @@
-From 1a419b902c5fc2d07e880fa13666fddf70100093 Mon Sep 17 00:00:00 2001
+From 530e8521e6172972a3e9c4d69865dd97e521ed34 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh 
 Date: Wed, 26 Jul 2017 14:30:41 -0400
 Subject: [PATCH 01/22] Set Tor Messenger preferences
 
 ---
- im/app/profile/all-instantbird.js | 468 --
- 1 file changed, 444 insertions(+), 24 deletions(-)
+ im/app/profile/all-instantbird.js | 467 --
+ 1 file changed, 443 insertions(+), 24 deletions(-)
 
 diff --git a/im/app/profile/all-instantbird.js 
b/im/app/profile/all-instantbird.js
-index 127c86a662..3a5f63909e 100644
+index 127c86a662..68da4aaf28 100644
 --- a/im/app/profile/all-instantbird.js
 +++ b/im/app/profile/all-instantbird.js
 @@ -1,3 +1,56 @@
@@ -198,7 +198,7 @@ index 127c86a662..3a5f63909e 100644
  
  pref("chat.twitter.consumerKey", "TSuyS1ieRAkB3qWv8yyEw");
  pref("chat.twitter.consumerSecret", 
"DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU");
-@@ -337,4 +387,374 @@ pref("chat.twitter.consumerSecret", 
"DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU
+@@ -337,4 +387,373 @@ pref("chat.twitter.consumerSecret", 
"DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU
  pref("chat.prpls.forcePurple", "");
  
  // Whether to parse log files for conversation statistics.
@@ -255,7 +255,6 @@ index 127c86a662..3a5f63909e 100644
 +pref("browser.privatebrowsing.autostart", true);
 +pref("browser.cache.disk.enable", false);
 +pref("browser.cache.offline.enable", false);
-+pref("dom.indexedDB.enabled", false);
 +pref("permissions.memory_only", true);
 +pref("network.cookie.lifetimePolicy", 2);
 +pref("browser.download.manager.retention", 1);
@@ -575,5 +574,5 @@ index 127c86a662..3a5f63909e 100644
 +#expand

[tor-commits] [tor-messenger-build/master] Enable content process sandbox on Windows

2017-10-23 Thread arlo

commit 4b91bfe6b84b508ae80538e12593bceaffe842c4
Author: Arlo Breault 
Date:   Mon Oct 23 10:58:40 2017 -0400

Enable content process sandbox on Windows
---
 ChangeLog   | 2 ++
 projects/instantbird/mozconfig-windows-i686 | 4 
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7c34e3f..16921c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@ Tor Messenger 0.5.0b2 --
* Trac 23542: Add snowflake pt
  * Mac
* Trac 23542: Add snowflake pt
+ * Windows
+   * Trac 16010: Enable the content process sandbox on Windows
 
 Tor Messenger 0.5.0b1 -- September 28, 2017
  * All Platforms
diff --git a/projects/instantbird/mozconfig-windows-i686 
b/projects/instantbird/mozconfig-windows-i686
index f8e335d..bca7c2c 100644
--- a/projects/instantbird/mozconfig-windows-i686
+++ b/projects/instantbird/mozconfig-windows-i686
@@ -7,7 +7,3 @@ ac_add_options --with-toolchain-prefix=i686-w64-mingw32-
 
 ac_add_options --enable-default-toolkit=cairo-windows
 ac_add_options --enable-strip
-
-# We can't build the sandbox code with mingw-w64:
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1042426
-ac_add_options --disable-sandbox

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

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

2017-10-23 Thread translation

commit 211e1b9266b0ae3b9d8a3ccf46c720a3bc06e167
Author: Translation commit bot 
Date:   Mon Oct 23 14:46:05 2017 +

Update translations for liveusb-creator
---
 nn/nn.po | 34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/nn/nn.po b/nn/nn.po
index abc268b03..cbc3dfc09 100644
--- a/nn/nn.po
+++ b/nn/nn.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# BjÃ¸rn I. , 2014,2016
+# BjÃ¸rn I. , 2014,2016-2017
 # Finn Brudal , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-20 18:02+0200\n"
-"PO-Revision-Date: 2017-09-21 01:33+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2017-09-25 14:02+0200\n"
+"PO-Revision-Date: 2017-10-23 14:41+\n"
+"Last-Translator: BjÃ¸rn I. \n"
 "Language-Team: Norwegian Nynorsk 
(http://www.transifex.com/otf/torproject/language/nn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -126,7 +126,7 @@ msgstr "UstÃ¸tta filsystem: %s"
 #: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
-msgstr ""
+msgstr "Ukjend GLib-unnatak under freistnad pÃ¥ montering av: %(message)s"
 
 #: ../tails_installer/creator.py:792
 #, python-format
@@ -192,7 +192,7 @@ msgstr "Installerer stÃ¸vellastar..."
 #: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
-msgstr ""
+msgstr "Klarte ikkje Ã¥ finne '%s' COM32-modulen"
 
 #: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
@@ -215,17 +215,17 @@ msgstr "Formaterer %(device)s som FAT32"
 
 #: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
-msgstr ""
+msgstr "Klarte ikkje Ã¥ finne syslinux' gptmbr.bin"
 
 #: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
-msgstr ""
+msgstr "Les utpakka MBR frÃ¥ %s"
 
 #: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
-msgstr ""
+msgstr "Klarte ikkje Ã¥ lese utpakka MBR frÃ¥ %(path)s"
 
 #: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
@@ -318,24 +318,24 @@ msgstr ""
 
 #: ../tails_installer/gui.py:454
 msgid "Upgrade"
-msgstr ""
+msgstr "Oppgrader"
 
 #: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7
 msgid "Install"
-msgstr ""
+msgstr "Installer"
 
 #: ../tails_installer/gui.py:465
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
-msgstr ""
+msgstr "%(size)s %(vendor)s %(model)s eining (%(device)s)"
 
 #: ../tails_installer/gui.py:476
 msgid "No ISO image selected"
-msgstr ""
+msgstr "ISO bilde ikkje valt"
 
 #: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
-msgstr ""
+msgstr "Vel eit Tails ISO-bilde."
 
 #: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
@@ -379,7 +379,7 @@ msgstr "Installering fullfÃ¸rd"
 
 #: ../tails_installer/gui.py:644
 msgid "Installation was completed."
-msgstr ""
+msgstr "Installeringa fullfÃ¸rt."
 
 #: ../tails_installer/gui.py:693
 msgid "Unable to mount device"
@@ -492,7 +492,7 @@ msgstr ""
 
 #: ../data/tails-installer.ui.h:2
 msgid "Clone the current Tails"
-msgstr ""
+msgstr "Klon gjeldande Tails"
 
 #: ../data/tails-installer.ui.h:3
 msgid "Use a downloaded Tails ISO image"
@@ -508,4 +508,4 @@ msgstr ""
 
 #: ../data/tails-installer.ui.h:6
 msgid "Reinstall (delete all data)"
-msgstr ""
+msgstr "Installer pÃ¥ nytt (slett alle dataa)"

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

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

2017-10-23 Thread translation

commit 82f156db2937890c94c6ce2ad5f00c8e5aecac7e
Author: Translation commit bot 
Date:   Mon Oct 23 14:45:46 2017 +

Update translations for https_everywhere
---
 nn/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nn/https-everywhere.dtd b/nn/https-everywhere.dtd
index 2e1e2d9e6..e62f9a886 100644
--- a/nn/https-everywhere.dtd
+++ b/nn/https-everywhere.dtd
@@ -11,7 +11,7 @@
 
 
 
-
+
 
 
 

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

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

2017-10-23 Thread translation

commit 477c06550a3d2e1c6a190e3a92710bc5be739dc0
Author: Translation commit bot 
Date:   Mon Oct 23 14:45:58 2017 +

Update translations for https_everywhere_completed
---
 nn/https-everywhere.dtd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nn/https-everywhere.dtd b/nn/https-everywhere.dtd
index a8829b394..e62f9a886 100644
--- a/nn/https-everywhere.dtd
+++ b/nn/https-everywhere.dtd
@@ -11,6 +11,7 @@
 
 
 
+
 
 
 

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

[tor-commits] [tor-messenger-build/master] Bump tor-browser-build to 9b4ba82

2017-10-23 Thread arlo

commit 4ff1d64dc1f9ae732978d319987bb7e7f3aed010
Author: Arlo Breault 
Date:   Mon Oct 23 10:33:46 2017 -0400

Bump tor-browser-build to 9b4ba82
---
 ChangeLog | 4 ++--
 projects/instantbird/mozconfig-osx-x86_64 | 3 ++-
 rbm.conf  | 2 +-
 tor-browser-build | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cb9d4ce..7c34e3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,9 @@
-Tor Messenger 0.5.0b2 -- 
+Tor Messenger 0.5.0b2 --
  * All Platforms
* Use the tor-browser-52.4.0esr-7.0-1-build1 tag on tor-browser
* Use the THUNDERBIRD_52_4_0_RELEASE tag on comm-esr52
* Update tor-browser to 7.0.6
-   * Update tor-browser-build to 8c4c05d
+   * Update tor-browser-build to 9b4ba82
  * Linux
* Trac 23806: libotr.so and libgcrypt.so are using RPATH
* Trac 23542: Add snowflake pt
diff --git a/projects/instantbird/mozconfig-osx-x86_64 
b/projects/instantbird/mozconfig-osx-x86_64
index 21154f5..cd1c4ef 100644
--- a/projects/instantbird/mozconfig-osx-x86_64
+++ b/projects/instantbird/mozconfig-osx-x86_64
@@ -5,7 +5,8 @@ TOOLCHAIN_DIR=/var/tmp/dist/macosx-toolchain
 CROSS_CCTOOLS_PATH=$TOOLCHAIN_DIR/cctools
 CROSS_SYSROOT=$TOOLCHAIN_DIR/SDK
 CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks
-FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B 
$CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT"
+HARDENING_FLAGS="-Werror=format -Werror=format-security 
-fstack-protector-strong -D_FORTIFY_SOURCE=2"
+FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B 
$CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS"
 
 export CC="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS"
 export CXX="$TOOLCHAIN_DIR/clang/bin/clang++ $FLAGS"
diff --git a/rbm.conf b/rbm.conf
index 5f793b2..e5938e4 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -310,7 +310,7 @@ ENV:
   # We will need to update this when there is a new spec version available
   runc_spec100 => sub {
 my ($out) = capture_exec('sudo', 'runc', '--version');
-return $out =~ m/^runc version spec: 1\.0\.0$/;
+return $out =~ m/^spec: 1\.0\.0$/m;
   },
 },
   )
diff --git a/tor-browser-build b/tor-browser-build
index 8c4c05d..9b4ba82 16
--- a/tor-browser-build
+++ b/tor-browser-build
@@ -1 +1 @@
-Subproject commit 8c4c05ddcfc30107b967b204d491523685460226
+Subproject commit 9b4ba8252a80fb10ca9fc22e90033d63383ac05d

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

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

2017-10-23 Thread nickm

commit 880d596f4dbb65885ebbc8b1b88e852529779324
Merge: 49e8352f1 8b8d50104
Author: Nick Mathewson 
Date:   Mon Oct 23 09:22:57 2017 -0400

Merge branch 'maint-0.3.2'

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

[tor-commits] [tor/master] Remove the length limit from write_http_status_line

2017-10-23 Thread nickm

commit af33fdd7c1860399fe8d6861c163e5d64b0292b9
Author: Nick Mathewson 
Date:   Mon Oct 23 09:21:22 2017 -0400

Remove the length limit from write_http_status_line

Fixes bug 23908; bugfix on 0.3.1.6-rc when we made the keypin
failure message really long.

Backport from 0.3.2's 771fb7e7baa789c55ba15c4c26c8a4889ff9fe8d,
where arma said "get rid of the scary 256-byte-buf landmine".
---
 changes/bug23908   |  3 +++
 src/or/directory.c | 10 --
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/changes/bug23908 b/changes/bug23908
new file mode 100644
index 0..f641b66bb
--- /dev/null
+++ b/changes/bug23908
@@ -0,0 +1,3 @@
+  o Minor bugfixes (directory authority, backport from 0.3.2.1-alpha):
+- Remove the length limit on HTTP status lines that authorities can send
+  in their replies. Fixes bug 23499; bugfix on 0.3.1.6-rc.
diff --git a/src/or/directory.c b/src/or/directory.c
index 45fbd1dd3..bef65d349 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -3282,14 +3282,12 @@ static void
 write_http_status_line(dir_connection_t *conn, int status,
const char *reason_phrase)
 {
-  char buf[256];
-  if (tor_snprintf(buf, sizeof(buf), "HTTP/1.0 %d %s\r\n\r\n",
-  status, reason_phrase ? reason_phrase : "OK") < 0) {
-log_warn(LD_BUG,"status line too long.");
-return;
-  }
+  char *buf = NULL;
+  tor_asprintf(, "HTTP/1.0 %d %s\r\n\r\n",
+   status, reason_phrase ? reason_phrase : "OK");
   log_debug(LD_DIRSERV,"Wrote status 'HTTP/1.0 %d %s'", status, reason_phrase);
   connection_write_to_buf(buf, strlen(buf), TO_CONN(conn));
+  tor_free(buf);
 }
 
 /** Write the header for an HTTP/1.0 response onto conn-\>outbuf,



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

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

2017-10-23 Thread nickm

commit 8b8d501040946bb2280a9640f91a55b7f17b03e3
Merge: 6a7aa4735 af33fdd7c
Author: Nick Mathewson 
Date:   Mon Oct 23 09:22:43 2017 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

"ours" merge to avoid taking af33fdd7c1860399fe8d6861c163e5d64b0292b9

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

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

2017-10-23 Thread nickm

commit 602f9565a932354c543353f5ab38079a8707b2ad
Merge: 5f78775a8 af33fdd7c
Author: Nick Mathewson 
Date:   Mon Oct 23 09:22:57 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug23908   |  3 +++
 src/or/directory.c | 10 --
 2 files changed, 7 insertions(+), 6 deletions(-)

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

[tor-commits] [tor/release-0.3.1] Remove the length limit from write_http_status_line

2017-10-23 Thread nickm

commit af33fdd7c1860399fe8d6861c163e5d64b0292b9
Author: Nick Mathewson 
Date:   Mon Oct 23 09:21:22 2017 -0400

Remove the length limit from write_http_status_line

Fixes bug 23908; bugfix on 0.3.1.6-rc when we made the keypin
failure message really long.

Backport from 0.3.2's 771fb7e7baa789c55ba15c4c26c8a4889ff9fe8d,
where arma said "get rid of the scary 256-byte-buf landmine".
---
 changes/bug23908   |  3 +++
 src/or/directory.c | 10 --
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/changes/bug23908 b/changes/bug23908
new file mode 100644
index 0..f641b66bb
--- /dev/null
+++ b/changes/bug23908
@@ -0,0 +1,3 @@
+  o Minor bugfixes (directory authority, backport from 0.3.2.1-alpha):
+- Remove the length limit on HTTP status lines that authorities can send
+  in their replies. Fixes bug 23499; bugfix on 0.3.1.6-rc.
diff --git a/src/or/directory.c b/src/or/directory.c
index 45fbd1dd3..bef65d349 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -3282,14 +3282,12 @@ static void
 write_http_status_line(dir_connection_t *conn, int status,
const char *reason_phrase)
 {
-  char buf[256];
-  if (tor_snprintf(buf, sizeof(buf), "HTTP/1.0 %d %s\r\n\r\n",
-  status, reason_phrase ? reason_phrase : "OK") < 0) {
-log_warn(LD_BUG,"status line too long.");
-return;
-  }
+  char *buf = NULL;
+  tor_asprintf(, "HTTP/1.0 %d %s\r\n\r\n",
+   status, reason_phrase ? reason_phrase : "OK");
   log_debug(LD_DIRSERV,"Wrote status 'HTTP/1.0 %d %s'", status, reason_phrase);
   connection_write_to_buf(buf, strlen(buf), TO_CONN(conn));
+  tor_free(buf);
 }
 
 /** Write the header for an HTTP/1.0 response onto conn-\>outbuf,



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

[tor-commits] [tor/release-0.3.2] Remove the length limit from write_http_status_line

2017-10-23 Thread nickm

commit af33fdd7c1860399fe8d6861c163e5d64b0292b9
Author: Nick Mathewson 
Date:   Mon Oct 23 09:21:22 2017 -0400

Remove the length limit from write_http_status_line

Fixes bug 23908; bugfix on 0.3.1.6-rc when we made the keypin
failure message really long.

Backport from 0.3.2's 771fb7e7baa789c55ba15c4c26c8a4889ff9fe8d,
where arma said "get rid of the scary 256-byte-buf landmine".
---
 changes/bug23908   |  3 +++
 src/or/directory.c | 10 --
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/changes/bug23908 b/changes/bug23908
new file mode 100644
index 0..f641b66bb
--- /dev/null
+++ b/changes/bug23908
@@ -0,0 +1,3 @@
+  o Minor bugfixes (directory authority, backport from 0.3.2.1-alpha):
+- Remove the length limit on HTTP status lines that authorities can send
+  in their replies. Fixes bug 23499; bugfix on 0.3.1.6-rc.
diff --git a/src/or/directory.c b/src/or/directory.c
index 45fbd1dd3..bef65d349 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -3282,14 +3282,12 @@ static void
 write_http_status_line(dir_connection_t *conn, int status,
const char *reason_phrase)
 {
-  char buf[256];
-  if (tor_snprintf(buf, sizeof(buf), "HTTP/1.0 %d %s\r\n\r\n",
-  status, reason_phrase ? reason_phrase : "OK") < 0) {
-log_warn(LD_BUG,"status line too long.");
-return;
-  }
+  char *buf = NULL;
+  tor_asprintf(, "HTTP/1.0 %d %s\r\n\r\n",
+   status, reason_phrase ? reason_phrase : "OK");
   log_debug(LD_DIRSERV,"Wrote status 'HTTP/1.0 %d %s'", status, reason_phrase);
   connection_write_to_buf(buf, strlen(buf), TO_CONN(conn));
+  tor_free(buf);
 }
 
 /** Write the header for an HTTP/1.0 response onto conn-\>outbuf,



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

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

2017-10-23 Thread nickm

commit 8b8d501040946bb2280a9640f91a55b7f17b03e3
Merge: 6a7aa4735 af33fdd7c
Author: Nick Mathewson 
Date:   Mon Oct 23 09:22:43 2017 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

"ours" merge to avoid taking af33fdd7c1860399fe8d6861c163e5d64b0292b9




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

[tor-commits] [tor/maint-0.3.2] Remove the length limit from write_http_status_line

2017-10-23 Thread nickm

commit af33fdd7c1860399fe8d6861c163e5d64b0292b9
Author: Nick Mathewson 
Date:   Mon Oct 23 09:21:22 2017 -0400

Remove the length limit from write_http_status_line

Fixes bug 23908; bugfix on 0.3.1.6-rc when we made the keypin
failure message really long.

Backport from 0.3.2's 771fb7e7baa789c55ba15c4c26c8a4889ff9fe8d,
where arma said "get rid of the scary 256-byte-buf landmine".
---
 changes/bug23908   |  3 +++
 src/or/directory.c | 10 --
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/changes/bug23908 b/changes/bug23908
new file mode 100644
index 0..f641b66bb
--- /dev/null
+++ b/changes/bug23908
@@ -0,0 +1,3 @@
+  o Minor bugfixes (directory authority, backport from 0.3.2.1-alpha):
+- Remove the length limit on HTTP status lines that authorities can send
+  in their replies. Fixes bug 23499; bugfix on 0.3.1.6-rc.
diff --git a/src/or/directory.c b/src/or/directory.c
index 45fbd1dd3..bef65d349 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -3282,14 +3282,12 @@ static void
 write_http_status_line(dir_connection_t *conn, int status,
const char *reason_phrase)
 {
-  char buf[256];
-  if (tor_snprintf(buf, sizeof(buf), "HTTP/1.0 %d %s\r\n\r\n",
-  status, reason_phrase ? reason_phrase : "OK") < 0) {
-log_warn(LD_BUG,"status line too long.");
-return;
-  }
+  char *buf = NULL;
+  tor_asprintf(, "HTTP/1.0 %d %s\r\n\r\n",
+   status, reason_phrase ? reason_phrase : "OK");
   log_debug(LD_DIRSERV,"Wrote status 'HTTP/1.0 %d %s'", status, reason_phrase);
   connection_write_to_buf(buf, strlen(buf), TO_CONN(conn));
+  tor_free(buf);
 }
 
 /** Write the header for an HTTP/1.0 response onto conn-\>outbuf,



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

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

2017-10-23 Thread nickm

commit 8b8d501040946bb2280a9640f91a55b7f17b03e3
Merge: 6a7aa4735 af33fdd7c
Author: Nick Mathewson 
Date:   Mon Oct 23 09:22:43 2017 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

"ours" merge to avoid taking af33fdd7c1860399fe8d6861c163e5d64b0292b9

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

[tor-commits] [tor/maint-0.3.1] Remove the length limit from write_http_status_line

2017-10-23 Thread nickm

commit af33fdd7c1860399fe8d6861c163e5d64b0292b9
Author: Nick Mathewson 
Date:   Mon Oct 23 09:21:22 2017 -0400

Remove the length limit from write_http_status_line

Fixes bug 23908; bugfix on 0.3.1.6-rc when we made the keypin
failure message really long.

Backport from 0.3.2's 771fb7e7baa789c55ba15c4c26c8a4889ff9fe8d,
where arma said "get rid of the scary 256-byte-buf landmine".
---
 changes/bug23908   |  3 +++
 src/or/directory.c | 10 --
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/changes/bug23908 b/changes/bug23908
new file mode 100644
index 0..f641b66bb
--- /dev/null
+++ b/changes/bug23908
@@ -0,0 +1,3 @@
+  o Minor bugfixes (directory authority, backport from 0.3.2.1-alpha):
+- Remove the length limit on HTTP status lines that authorities can send
+  in their replies. Fixes bug 23499; bugfix on 0.3.1.6-rc.
diff --git a/src/or/directory.c b/src/or/directory.c
index 45fbd1dd3..bef65d349 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -3282,14 +3282,12 @@ static void
 write_http_status_line(dir_connection_t *conn, int status,
const char *reason_phrase)
 {
-  char buf[256];
-  if (tor_snprintf(buf, sizeof(buf), "HTTP/1.0 %d %s\r\n\r\n",
-  status, reason_phrase ? reason_phrase : "OK") < 0) {
-log_warn(LD_BUG,"status line too long.");
-return;
-  }
+  char *buf = NULL;
+  tor_asprintf(, "HTTP/1.0 %d %s\r\n\r\n",
+   status, reason_phrase ? reason_phrase : "OK");
   log_debug(LD_DIRSERV,"Wrote status 'HTTP/1.0 %d %s'", status, reason_phrase);
   connection_write_to_buf(buf, strlen(buf), TO_CONN(conn));
+  tor_free(buf);
 }
 
 /** Write the header for an HTTP/1.0 response onto conn-\>outbuf,

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

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

2017-10-23 Thread nickm

commit 85115796bb9095db2b59624b16c005f2252d4d71
Merge: 23e3d57e1 eac4c374e
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)




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

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

2017-10-23 Thread nickm

commit 6a7aa4735724cdf8d37e4109705338a1ea947449
Merge: 009141c6a 85115796b
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

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

2017-10-23 Thread nickm

commit eac4c374e456af4f216392ec2d3b037d5f57e2f3
Merge: c93ecb818 fcd5c3144
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)




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

[tor-commits] [tor/release-0.3.2] Adjust test, now that there are 9 dirauths again

2017-10-23 Thread nickm

commit a5f5bda462d489cb02f97e9847011b46a350512a
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:07 2017 -0400

Adjust test, now that there are 9 dirauths again
---
 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/test_config.c b/src/test/test_config.c
index 90ea4da87..b48d5e8d2 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -1632,8 +1632,8 @@ test_config_adding_default_trusted_dir_servers(void *arg)
 
   /* Assume we have eight V3 authorities */
   add_default_trusted_dir_authorities(V3_DIRINFO);
-  tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 8);
-  tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 9);
+  tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 9);
+  tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 10);
 
  done:
   clear_dir_servers();



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

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

2017-10-23 Thread nickm

commit fcd5c3144a44f4081e9e7c4336b932e31ae45f77
Merge: 1db5081ba a5f5bda46
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)




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

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

2017-10-23 Thread nickm

commit eac4c374e456af4f216392ec2d3b037d5f57e2f3
Merge: c93ecb818 fcd5c3144
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)




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

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

2017-10-23 Thread nickm

commit 85115796bb9095db2b59624b16c005f2252d4d71
Merge: 23e3d57e1 eac4c374e
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)




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

[tor-commits] [tor/maint-0.3.2] Adjust test, now that there are 9 dirauths again

2017-10-23 Thread nickm

commit a5f5bda462d489cb02f97e9847011b46a350512a
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:07 2017 -0400

Adjust test, now that there are 9 dirauths again
---
 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/test_config.c b/src/test/test_config.c
index 90ea4da87..b48d5e8d2 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -1632,8 +1632,8 @@ test_config_adding_default_trusted_dir_servers(void *arg)
 
   /* Assume we have eight V3 authorities */
   add_default_trusted_dir_authorities(V3_DIRINFO);
-  tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 8);
-  tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 9);
+  tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 9);
+  tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 10);
 
  done:
   clear_dir_servers();



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

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

2017-10-23 Thread nickm

commit fcd5c3144a44f4081e9e7c4336b932e31ae45f77
Merge: 1db5081ba a5f5bda46
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)




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

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

2017-10-23 Thread nickm

commit 6a7aa4735724cdf8d37e4109705338a1ea947449
Merge: 009141c6a 85115796b
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

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

2017-10-23 Thread nickm

commit 5f78775a8a1d1155fc14231c5a416ab23d3a02ab
Merge: 11abdccc7 85115796b
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

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

2017-10-23 Thread nickm

commit eac4c374e456af4f216392ec2d3b037d5f57e2f3
Merge: c93ecb818 fcd5c3144
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)




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

[tor-commits] [tor/release-0.3.0] Adjust test, now that there are 9 dirauths again

2017-10-23 Thread nickm

commit a5f5bda462d489cb02f97e9847011b46a350512a
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:07 2017 -0400

Adjust test, now that there are 9 dirauths again
---
 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/test_config.c b/src/test/test_config.c
index 90ea4da87..b48d5e8d2 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -1632,8 +1632,8 @@ test_config_adding_default_trusted_dir_servers(void *arg)
 
   /* Assume we have eight V3 authorities */
   add_default_trusted_dir_authorities(V3_DIRINFO);
-  tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 8);
-  tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 9);
+  tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 9);
+  tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 10);
 
  done:
   clear_dir_servers();



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

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

2017-10-23 Thread nickm

commit eac4c374e456af4f216392ec2d3b037d5f57e2f3
Merge: c93ecb818 fcd5c3144
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)




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

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

2017-10-23 Thread nickm

commit df4eba5c296caaf6a58835fe1fa113069d8631b8
Merge: d65016c0b fcd5c3144
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

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

2017-10-23 Thread nickm

commit 85115796bb9095db2b59624b16c005f2252d4d71
Merge: 23e3d57e1 eac4c374e
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)




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

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

2017-10-23 Thread nickm

commit fe022f3ab0727d9f245b961c6cdc4d9c46f8c9bc
Merge: 00322a9ba eac4c374e
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

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

2017-10-23 Thread nickm

commit fcd5c3144a44f4081e9e7c4336b932e31ae45f77
Merge: 1db5081ba a5f5bda46
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)




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

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

2017-10-23 Thread nickm

commit fcd5c3144a44f4081e9e7c4336b932e31ae45f77
Merge: 1db5081ba a5f5bda46
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)




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

[tor-commits] [tor/release-0.3.1] Adjust test, now that there are 9 dirauths again

2017-10-23 Thread nickm

commit a5f5bda462d489cb02f97e9847011b46a350512a
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:07 2017 -0400

Adjust test, now that there are 9 dirauths again
---
 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/test_config.c b/src/test/test_config.c
index 90ea4da87..b48d5e8d2 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -1632,8 +1632,8 @@ test_config_adding_default_trusted_dir_servers(void *arg)
 
   /* Assume we have eight V3 authorities */
   add_default_trusted_dir_authorities(V3_DIRINFO);
-  tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 8);
-  tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 9);
+  tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 9);
+  tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 10);
 
  done:
   clear_dir_servers();



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

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

2017-10-23 Thread nickm

commit fcd5c3144a44f4081e9e7c4336b932e31ae45f77
Merge: 1db5081ba a5f5bda46
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)




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

[tor-commits] [tor/maint-0.3.0] Adjust test, now that there are 9 dirauths again

2017-10-23 Thread nickm

commit a5f5bda462d489cb02f97e9847011b46a350512a
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:07 2017 -0400

Adjust test, now that there are 9 dirauths again
---
 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/test_config.c b/src/test/test_config.c
index 90ea4da87..b48d5e8d2 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -1632,8 +1632,8 @@ test_config_adding_default_trusted_dir_servers(void *arg)
 
   /* Assume we have eight V3 authorities */
   add_default_trusted_dir_authorities(V3_DIRINFO);
-  tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 8);
-  tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 9);
+  tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 9);
+  tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 10);
 
  done:
   clear_dir_servers();



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

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

2017-10-23 Thread nickm

commit 6a7aa4735724cdf8d37e4109705338a1ea947449
Merge: 009141c6a 85115796b
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)




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

[tor-commits] [tor/release-0.2.8] Adjust test, now that there are 9 dirauths again

2017-10-23 Thread nickm

commit a5f5bda462d489cb02f97e9847011b46a350512a
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:07 2017 -0400

Adjust test, now that there are 9 dirauths again
---
 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/test_config.c b/src/test/test_config.c
index 90ea4da87..b48d5e8d2 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -1632,8 +1632,8 @@ test_config_adding_default_trusted_dir_servers(void *arg)
 
   /* Assume we have eight V3 authorities */
   add_default_trusted_dir_authorities(V3_DIRINFO);
-  tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 8);
-  tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 9);
+  tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 9);
+  tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 10);
 
  done:
   clear_dir_servers();



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

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

2017-10-23 Thread nickm

commit 85115796bb9095db2b59624b16c005f2252d4d71
Merge: 23e3d57e1 eac4c374e
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)




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

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

2017-10-23 Thread nickm

commit fcd5c3144a44f4081e9e7c4336b932e31ae45f77
Merge: 1db5081ba a5f5bda46
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)




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

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

2017-10-23 Thread nickm

commit 85115796bb9095db2b59624b16c005f2252d4d71
Merge: 23e3d57e1 eac4c374e
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

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

2017-10-23 Thread nickm

commit eac4c374e456af4f216392ec2d3b037d5f57e2f3
Merge: c93ecb818 fcd5c3144
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

[tor-commits] [tor/release-0.2.9] Adjust test, now that there are 9 dirauths again

2017-10-23 Thread nickm

commit a5f5bda462d489cb02f97e9847011b46a350512a
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:07 2017 -0400

Adjust test, now that there are 9 dirauths again
---
 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/test_config.c b/src/test/test_config.c
index 90ea4da87..b48d5e8d2 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -1632,8 +1632,8 @@ test_config_adding_default_trusted_dir_servers(void *arg)
 
   /* Assume we have eight V3 authorities */
   add_default_trusted_dir_authorities(V3_DIRINFO);
-  tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 8);
-  tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 9);
+  tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 9);
+  tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 10);
 
  done:
   clear_dir_servers();



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

1 2 3 4 >

1 - 100 of 339 matches

Mail list logo