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

2018-09-13 Thread nickm 
commit c02f2d9eb45786c552dcc33c102e9964d95f66c1
Merge: 198b6354e 73a37d1e5
Author: Nick Mathewson 
Date:   Thu Sep 13 11:45:58 2018 -0400

Merge branch 'bug27658_029' into maint-0.2.9

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)



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

[tor-commits] [tor/release-0.3.4] Check waitpid return value and exit status in tinytest.c

2018-09-13 Thread nickm 
commit 73a37d1e547d996515e2a0ffea8331bb535d2841
Author: Nick Mathewson 
Date:   Wed Sep 12 08:57:18 2018 -0400

Check waitpid return value and exit status in tinytest.c

It's possible for a unit test to report success via its pipe, but to
fail as it tries to clean up and exit.  Notably, this happens on a
leak sanitizer failure.

Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was
introduced.
---
 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/changes/bug27658 b/changes/bug27658
new file mode 100644
index 0..8cc0aa471
--- /dev/null
+++ b/changes/bug27658
@@ -0,0 +1,6 @@
+  o Minor bugfixes (testing):
+- If a unit test running in a subprocess exits abnormally or with a
+  nonzero status code, treat the test as having failed, even if
+  the test reported success. Without this fix, memory leaks don't cause
+  cause the tests to fail, even with LeakSanitizer. Fixes bug 27658;
+  bugfix on 0.2.2.4-alpha.
diff --git a/src/ext/tinytest.c b/src/ext/tinytest.c
index 3fb1b39c7..a51cd6011 100644
--- a/src/ext/tinytest.c
+++ b/src/ext/tinytest.c
@@ -207,12 +207,20 @@ testcase_run_forked_(const struct testgroup_t *group,
r = (int)read(outcome_pipe[0], b, 1);
if (r == 0) {
printf("[Lost connection!] ");
-   return 0;
+   return FAIL;
} else if (r != 1) {
perror("read outcome from pipe");
}
-   waitpid(pid, &status, 0);
+   r = waitpid(pid, &status, 0);
close(outcome_pipe[0]);
+   if (r == -1) {
+   perror("waitpid");
+   return FAIL;
+   }
+if (! WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+   printf("[did not exit cleanly.]");
+   return FAIL;
+}
return b[0]=='Y' ? OK : (b[0]=='S' ? SKIP : FAIL);
}
 #endif



___
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.2

2018-09-13 Thread nickm 
commit 9697c2da4680267038d407093cbcbc4c68059904
Merge: 5a8827a4c c02f2d9eb
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)



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

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

2018-09-13 Thread nickm 
commit c02f2d9eb45786c552dcc33c102e9964d95f66c1
Merge: 198b6354e 73a37d1e5
Author: Nick Mathewson 
Date:   Thu Sep 13 11:45:58 2018 -0400

Merge branch 'bug27658_029' into maint-0.2.9

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)



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

[tor-commits] [tor/release-0.2.9] Check waitpid return value and exit status in tinytest.c

2018-09-13 Thread nickm 
commit 73a37d1e547d996515e2a0ffea8331bb535d2841
Author: Nick Mathewson 
Date:   Wed Sep 12 08:57:18 2018 -0400

Check waitpid return value and exit status in tinytest.c

It's possible for a unit test to report success via its pipe, but to
fail as it tries to clean up and exit.  Notably, this happens on a
leak sanitizer failure.

Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was
introduced.
---
 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/changes/bug27658 b/changes/bug27658
new file mode 100644
index 0..8cc0aa471
--- /dev/null
+++ b/changes/bug27658
@@ -0,0 +1,6 @@
+  o Minor bugfixes (testing):
+- If a unit test running in a subprocess exits abnormally or with a
+  nonzero status code, treat the test as having failed, even if
+  the test reported success. Without this fix, memory leaks don't cause
+  cause the tests to fail, even with LeakSanitizer. Fixes bug 27658;
+  bugfix on 0.2.2.4-alpha.
diff --git a/src/ext/tinytest.c b/src/ext/tinytest.c
index 3fb1b39c7..a51cd6011 100644
--- a/src/ext/tinytest.c
+++ b/src/ext/tinytest.c
@@ -207,12 +207,20 @@ testcase_run_forked_(const struct testgroup_t *group,
r = (int)read(outcome_pipe[0], b, 1);
if (r == 0) {
printf("[Lost connection!] ");
-   return 0;
+   return FAIL;
} else if (r != 1) {
perror("read outcome from pipe");
}
-   waitpid(pid, &status, 0);
+   r = waitpid(pid, &status, 0);
close(outcome_pipe[0]);
+   if (r == -1) {
+   perror("waitpid");
+   return FAIL;
+   }
+if (! WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+   printf("[did not exit cleanly.]");
+   return FAIL;
+}
return b[0]=='Y' ? OK : (b[0]=='S' ? SKIP : FAIL);
}
 #endif



___
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.2

2018-09-13 Thread nickm 
commit 9697c2da4680267038d407093cbcbc4c68059904
Merge: 5a8827a4c c02f2d9eb
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)



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

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

2018-09-13 Thread nickm 
commit c02f2d9eb45786c552dcc33c102e9964d95f66c1
Merge: 198b6354e 73a37d1e5
Author: Nick Mathewson 
Date:   Thu Sep 13 11:45:58 2018 -0400

Merge branch 'bug27658_029' into maint-0.2.9

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)



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

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

2018-09-13 Thread nickm 
commit c02f2d9eb45786c552dcc33c102e9964d95f66c1
Merge: 198b6354e 73a37d1e5
Author: Nick Mathewson 
Date:   Thu Sep 13 11:45:58 2018 -0400

Merge branch 'bug27658_029' into maint-0.2.9

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)



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

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

2018-09-13 Thread nickm 
commit 9697c2da4680267038d407093cbcbc4c68059904
Merge: 5a8827a4c c02f2d9eb
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)



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

[tor-commits] [tor/release-0.3.2] Check waitpid return value and exit status in tinytest.c

2018-09-13 Thread nickm 
commit 73a37d1e547d996515e2a0ffea8331bb535d2841
Author: Nick Mathewson 
Date:   Wed Sep 12 08:57:18 2018 -0400

Check waitpid return value and exit status in tinytest.c

It's possible for a unit test to report success via its pipe, but to
fail as it tries to clean up and exit.  Notably, this happens on a
leak sanitizer failure.

Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was
introduced.
---
 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/changes/bug27658 b/changes/bug27658
new file mode 100644
index 0..8cc0aa471
--- /dev/null
+++ b/changes/bug27658
@@ -0,0 +1,6 @@
+  o Minor bugfixes (testing):
+- If a unit test running in a subprocess exits abnormally or with a
+  nonzero status code, treat the test as having failed, even if
+  the test reported success. Without this fix, memory leaks don't cause
+  cause the tests to fail, even with LeakSanitizer. Fixes bug 27658;
+  bugfix on 0.2.2.4-alpha.
diff --git a/src/ext/tinytest.c b/src/ext/tinytest.c
index 3fb1b39c7..a51cd6011 100644
--- a/src/ext/tinytest.c
+++ b/src/ext/tinytest.c
@@ -207,12 +207,20 @@ testcase_run_forked_(const struct testgroup_t *group,
r = (int)read(outcome_pipe[0], b, 1);
if (r == 0) {
printf("[Lost connection!] ");
-   return 0;
+   return FAIL;
} else if (r != 1) {
perror("read outcome from pipe");
}
-   waitpid(pid, &status, 0);
+   r = waitpid(pid, &status, 0);
close(outcome_pipe[0]);
+   if (r == -1) {
+   perror("waitpid");
+   return FAIL;
+   }
+if (! WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+   printf("[did not exit cleanly.]");
+   return FAIL;
+}
return b[0]=='Y' ? OK : (b[0]=='S' ? SKIP : FAIL);
}
 #endif



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

2018-09-13 Thread nickm 
commit 8253428253109dabc35861cbaab23a44a22eb24d
Merge: 4fa46fca8 9697c2da4
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)



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

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

2018-09-13 Thread nickm 
commit 8253428253109dabc35861cbaab23a44a22eb24d
Merge: 4fa46fca8 9697c2da4
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

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

[tor-commits] [tor/maint-0.3.4] Check waitpid return value and exit status in tinytest.c

2018-09-13 Thread nickm 
commit 73a37d1e547d996515e2a0ffea8331bb535d2841
Author: Nick Mathewson 
Date:   Wed Sep 12 08:57:18 2018 -0400

Check waitpid return value and exit status in tinytest.c

It's possible for a unit test to report success via its pipe, but to
fail as it tries to clean up and exit.  Notably, this happens on a
leak sanitizer failure.

Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was
introduced.
---
 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/changes/bug27658 b/changes/bug27658
new file mode 100644
index 0..8cc0aa471
--- /dev/null
+++ b/changes/bug27658
@@ -0,0 +1,6 @@
+  o Minor bugfixes (testing):
+- If a unit test running in a subprocess exits abnormally or with a
+  nonzero status code, treat the test as having failed, even if
+  the test reported success. Without this fix, memory leaks don't cause
+  cause the tests to fail, even with LeakSanitizer. Fixes bug 27658;
+  bugfix on 0.2.2.4-alpha.
diff --git a/src/ext/tinytest.c b/src/ext/tinytest.c
index 3fb1b39c7..a51cd6011 100644
--- a/src/ext/tinytest.c
+++ b/src/ext/tinytest.c
@@ -207,12 +207,20 @@ testcase_run_forked_(const struct testgroup_t *group,
r = (int)read(outcome_pipe[0], b, 1);
if (r == 0) {
printf("[Lost connection!] ");
-   return 0;
+   return FAIL;
} else if (r != 1) {
perror("read outcome from pipe");
}
-   waitpid(pid, &status, 0);
+   r = waitpid(pid, &status, 0);
close(outcome_pipe[0]);
+   if (r == -1) {
+   perror("waitpid");
+   return FAIL;
+   }
+if (! WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+   printf("[did not exit cleanly.]");
+   return FAIL;
+}
return b[0]=='Y' ? OK : (b[0]=='S' ? SKIP : FAIL);
}
 #endif



___
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.3' into maint-0.3.4

2018-09-13 Thread nickm 
commit 3ddfd5ff25b1319dee3a013c8dac02ff9121971e
Merge: f8d5fb42a 825342825
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)



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

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

2018-09-13 Thread nickm 
commit c02f2d9eb45786c552dcc33c102e9964d95f66c1
Merge: 198b6354e 73a37d1e5
Author: Nick Mathewson 
Date:   Thu Sep 13 11:45:58 2018 -0400

Merge branch 'bug27658_029' into maint-0.2.9

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)



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

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

2018-09-13 Thread nickm 
commit 9697c2da4680267038d407093cbcbc4c68059904
Merge: 5a8827a4c c02f2d9eb
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)



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

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

2018-09-13 Thread nickm 
commit 8253428253109dabc35861cbaab23a44a22eb24d
Merge: 4fa46fca8 9697c2da4
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)



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

[tor-commits] [tor/maint-0.3.3] Check waitpid return value and exit status in tinytest.c

2018-09-13 Thread nickm 
commit 73a37d1e547d996515e2a0ffea8331bb535d2841
Author: Nick Mathewson 
Date:   Wed Sep 12 08:57:18 2018 -0400

Check waitpid return value and exit status in tinytest.c

It's possible for a unit test to report success via its pipe, but to
fail as it tries to clean up and exit.  Notably, this happens on a
leak sanitizer failure.

Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was
introduced.
---
 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/changes/bug27658 b/changes/bug27658
new file mode 100644
index 0..8cc0aa471
--- /dev/null
+++ b/changes/bug27658
@@ -0,0 +1,6 @@
+  o Minor bugfixes (testing):
+- If a unit test running in a subprocess exits abnormally or with a
+  nonzero status code, treat the test as having failed, even if
+  the test reported success. Without this fix, memory leaks don't cause
+  cause the tests to fail, even with LeakSanitizer. Fixes bug 27658;
+  bugfix on 0.2.2.4-alpha.
diff --git a/src/ext/tinytest.c b/src/ext/tinytest.c
index 3fb1b39c7..a51cd6011 100644
--- a/src/ext/tinytest.c
+++ b/src/ext/tinytest.c
@@ -207,12 +207,20 @@ testcase_run_forked_(const struct testgroup_t *group,
r = (int)read(outcome_pipe[0], b, 1);
if (r == 0) {
printf("[Lost connection!] ");
-   return 0;
+   return FAIL;
} else if (r != 1) {
perror("read outcome from pipe");
}
-   waitpid(pid, &status, 0);
+   r = waitpid(pid, &status, 0);
close(outcome_pipe[0]);
+   if (r == -1) {
+   perror("waitpid");
+   return FAIL;
+   }
+if (! WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+   printf("[did not exit cleanly.]");
+   return FAIL;
+}
return b[0]=='Y' ? OK : (b[0]=='S' ? SKIP : FAIL);
}
 #endif



___
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.4] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-09-13 Thread nickm 
commit 3ddfd5ff25b1319dee3a013c8dac02ff9121971e
Merge: f8d5fb42a 825342825
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

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

[tor-commits] [tor/master] Check waitpid return value and exit status in tinytest.c

2018-09-13 Thread nickm 
commit 73a37d1e547d996515e2a0ffea8331bb535d2841
Author: Nick Mathewson 
Date:   Wed Sep 12 08:57:18 2018 -0400

Check waitpid return value and exit status in tinytest.c

It's possible for a unit test to report success via its pipe, but to
fail as it tries to clean up and exit.  Notably, this happens on a
leak sanitizer failure.

Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was
introduced.
---
 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/changes/bug27658 b/changes/bug27658
new file mode 100644
index 0..8cc0aa471
--- /dev/null
+++ b/changes/bug27658
@@ -0,0 +1,6 @@
+  o Minor bugfixes (testing):
+- If a unit test running in a subprocess exits abnormally or with a
+  nonzero status code, treat the test as having failed, even if
+  the test reported success. Without this fix, memory leaks don't cause
+  cause the tests to fail, even with LeakSanitizer. Fixes bug 27658;
+  bugfix on 0.2.2.4-alpha.
diff --git a/src/ext/tinytest.c b/src/ext/tinytest.c
index 3fb1b39c7..a51cd6011 100644
--- a/src/ext/tinytest.c
+++ b/src/ext/tinytest.c
@@ -207,12 +207,20 @@ testcase_run_forked_(const struct testgroup_t *group,
r = (int)read(outcome_pipe[0], b, 1);
if (r == 0) {
printf("[Lost connection!] ");
-   return 0;
+   return FAIL;
} else if (r != 1) {
perror("read outcome from pipe");
}
-   waitpid(pid, &status, 0);
+   r = waitpid(pid, &status, 0);
close(outcome_pipe[0]);
+   if (r == -1) {
+   perror("waitpid");
+   return FAIL;
+   }
+if (! WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+   printf("[did not exit cleanly.]");
+   return FAIL;
+}
return b[0]=='Y' ? OK : (b[0]=='S' ? SKIP : FAIL);
}
 #endif



___
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] Check waitpid return value and exit status in tinytest.c

2018-09-13 Thread nickm 
commit 73a37d1e547d996515e2a0ffea8331bb535d2841
Author: Nick Mathewson 
Date:   Wed Sep 12 08:57:18 2018 -0400

Check waitpid return value and exit status in tinytest.c

It's possible for a unit test to report success via its pipe, but to
fail as it tries to clean up and exit.  Notably, this happens on a
leak sanitizer failure.

Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was
introduced.
---
 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/changes/bug27658 b/changes/bug27658
new file mode 100644
index 0..8cc0aa471
--- /dev/null
+++ b/changes/bug27658
@@ -0,0 +1,6 @@
+  o Minor bugfixes (testing):
+- If a unit test running in a subprocess exits abnormally or with a
+  nonzero status code, treat the test as having failed, even if
+  the test reported success. Without this fix, memory leaks don't cause
+  cause the tests to fail, even with LeakSanitizer. Fixes bug 27658;
+  bugfix on 0.2.2.4-alpha.
diff --git a/src/ext/tinytest.c b/src/ext/tinytest.c
index 3fb1b39c7..a51cd6011 100644
--- a/src/ext/tinytest.c
+++ b/src/ext/tinytest.c
@@ -207,12 +207,20 @@ testcase_run_forked_(const struct testgroup_t *group,
r = (int)read(outcome_pipe[0], b, 1);
if (r == 0) {
printf("[Lost connection!] ");
-   return 0;
+   return FAIL;
} else if (r != 1) {
perror("read outcome from pipe");
}
-   waitpid(pid, &status, 0);
+   r = waitpid(pid, &status, 0);
close(outcome_pipe[0]);
+   if (r == -1) {
+   perror("waitpid");
+   return FAIL;
+   }
+if (! WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+   printf("[did not exit cleanly.]");
+   return FAIL;
+}
return b[0]=='Y' ? OK : (b[0]=='S' ? SKIP : FAIL);
}
 #endif



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

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

2018-09-13 Thread nickm 
commit c02f2d9eb45786c552dcc33c102e9964d95f66c1
Merge: 198b6354e 73a37d1e5
Author: Nick Mathewson 
Date:   Thu Sep 13 11:45:58 2018 -0400

Merge branch 'bug27658_029' into maint-0.2.9

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

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

[tor-commits] [tor/maint-0.3.2] Check waitpid return value and exit status in tinytest.c

2018-09-13 Thread nickm 
commit 73a37d1e547d996515e2a0ffea8331bb535d2841
Author: Nick Mathewson 
Date:   Wed Sep 12 08:57:18 2018 -0400

Check waitpid return value and exit status in tinytest.c

It's possible for a unit test to report success via its pipe, but to
fail as it tries to clean up and exit.  Notably, this happens on a
leak sanitizer failure.

Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was
introduced.
---
 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/changes/bug27658 b/changes/bug27658
new file mode 100644
index 0..8cc0aa471
--- /dev/null
+++ b/changes/bug27658
@@ -0,0 +1,6 @@
+  o Minor bugfixes (testing):
+- If a unit test running in a subprocess exits abnormally or with a
+  nonzero status code, treat the test as having failed, even if
+  the test reported success. Without this fix, memory leaks don't cause
+  cause the tests to fail, even with LeakSanitizer. Fixes bug 27658;
+  bugfix on 0.2.2.4-alpha.
diff --git a/src/ext/tinytest.c b/src/ext/tinytest.c
index 3fb1b39c7..a51cd6011 100644
--- a/src/ext/tinytest.c
+++ b/src/ext/tinytest.c
@@ -207,12 +207,20 @@ testcase_run_forked_(const struct testgroup_t *group,
r = (int)read(outcome_pipe[0], b, 1);
if (r == 0) {
printf("[Lost connection!] ");
-   return 0;
+   return FAIL;
} else if (r != 1) {
perror("read outcome from pipe");
}
-   waitpid(pid, &status, 0);
+   r = waitpid(pid, &status, 0);
close(outcome_pipe[0]);
+   if (r == -1) {
+   perror("waitpid");
+   return FAIL;
+   }
+if (! WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+   printf("[did not exit cleanly.]");
+   return FAIL;
+}
return b[0]=='Y' ? OK : (b[0]=='S' ? SKIP : FAIL);
}
 #endif



___
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.2

2018-09-13 Thread nickm 
commit 9697c2da4680267038d407093cbcbc4c68059904
Merge: 5a8827a4c c02f2d9eb
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

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

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

2018-09-13 Thread nickm 
commit c02f2d9eb45786c552dcc33c102e9964d95f66c1
Merge: 198b6354e 73a37d1e5
Author: Nick Mathewson 
Date:   Thu Sep 13 11:45:58 2018 -0400

Merge branch 'bug27658_029' into maint-0.2.9

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)



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

[tor-commits] [tor-ramdisk/master] Update configs. Don't assume we have grub1.

2018-09-13 Thread blueness 
commit 2e891835d6f05a983439d05cbd853b0b1811ad97
Author: Anthony G. Basile 
Date:   Thu Sep 13 10:12:37 2018 -0400

Update configs.  Don't assume we have grub1.
---
 build.sh   |   6 +-
 ...busybox-1.26.2.config => busybox-1.29.3.config} | 236 ---
 2.debug.config => busybox-1.29.3.debug.config} | 274 ---
 ...7.x86_64.config => kernel-4.18.7.x86_64.config} | 786 +++--
 4 files changed, 735 insertions(+), 567 deletions(-)

diff --git a/build.sh b/build.sh
index 789e2ce..af787f5 100755
--- a/build.sh
+++ b/build.sh
@@ -5,6 +5,7 @@ BUSYBOX=busybox-1.29.3
 NTPD=openntpd-6.2p3
 OPENSSH=openssh-7.7p1
 HAVEGED=haveged-1.9.4
+GRUB=grub-0.97
 
 KVERSION=4.18.7
 LINUX=linux-${KVERSION}
@@ -77,7 +78,9 @@ get_sources()
[[ ! -f $LINUX.tar.xz ]] && wget 
http://www.kernel.org/pub/linux/kernel/v4.x/$LINUX.tar.xz
#[[ ! -f $PATCHES.tar.bz2 ]] && wget 
http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/$PATCHES.tar.bz2
[[ ! -f $OPENSSH.tar.gz ]] && wget 
http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$OPENSSH.tar.gz
-   [[ ! -f $HAVEGED.tar.gz ]] && wget 
http://www.issihosts.com/haveged/$HAVEGED.tar.gz
+   #[[ ! -f $HAVEGED.tar.gz ]] && wget 
http://www.issihosts.com/haveged/$HAVEGED.tar.gz
+   [[ ! -f $HAVEGED.tar.gz ]] && wget 
https://github.com/jirka-h/haveged/archive/${HAVEGED/haveged-}.tar.gz -O 
$HAVEGED.tar.gz
+   [[ ! -f $GRUB.tar.gz ]] && wget 
http://distfiles.gentoo.org/distfiles/$GRUB.tar.gz
 }
 
 

@@ -380,6 +383,7 @@ compile_kernel()
 make_iso()
 {
cd $WORKING
+   tar xvf $WORKING/../sources/$GRUB.tar.gz
mkdir -p iso.tor/boot/grub
cp /lib/grub/i386-pc/stage2_eltorito iso.tor/boot/grub/
cp $WORKING/initramfs.igz iso.tor/boot
diff --git a/configs/busybox-1.26.2.config b/configs/busybox-1.29.3.config
similarity index 90%
rename from configs/busybox-1.26.2.config
rename to configs/busybox-1.29.3.config
index 497d9ac..de0dafa 100644
--- a/configs/busybox-1.26.2.config
+++ b/configs/busybox-1.29.3.config
@@ -1,40 +1,40 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.26.2
-# Sat Jan 28 23:26:21 2017
+# Busybox version: 1.29.3
+# Wed Sep 12 22:07:58 2018
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
 #
-# Busybox Settings
+# Settings
 #
 # CONFIG_DESKTOP is not set
 # CONFIG_EXTRA_COMPAT is not set
+# CONFIG_FEDORA_COMPAT is not set
 # CONFIG_INCLUDE_SUSv2 is not set
-# CONFIG_USE_PORTABLE_CODE is not set
-CONFIG_PLATFORM_LINUX=y
+CONFIG_LONG_OPTS=y
 # CONFIG_SHOW_USAGE is not set
 # CONFIG_FEATURE_VERBOSE_USAGE is not set
 # CONFIG_FEATURE_COMPRESS_USAGE is not set
-CONFIG_BUSYBOX=y
-CONFIG_FEATURE_INSTALLER=y
-# CONFIG_INSTALL_NO_USR is not set
+# CONFIG_LFS is not set
 # CONFIG_PAM is not set
-# CONFIG_LONG_OPTS is not set
 # CONFIG_FEATURE_DEVPTS is not set
-# CONFIG_FEATURE_CLEAN_UP is not set
 # CONFIG_FEATURE_UTMP is not set
 # CONFIG_FEATURE_WTMP is not set
 # CONFIG_FEATURE_PIDFILE is not set
 CONFIG_PID_FILE_PATH=""
+CONFIG_BUSYBOX=y
+CONFIG_FEATURE_INSTALLER=y
+# CONFIG_INSTALL_NO_USR is not set
 # CONFIG_FEATURE_SUID is not set
 # CONFIG_FEATURE_SUID_CONFIG is not set
 # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-# CONFIG_SELINUX is not set
 # CONFIG_FEATURE_PREFER_APPLETS is not set
 CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox"
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_CLEAN_UP is not set
 CONFIG_FEATURE_SYSLOG=y
-# CONFIG_FEATURE_HAVE_RPC is not set
+CONFIG_PLATFORM_LINUX=y
 
 #
 # Build Options
@@ -43,14 +43,16 @@ CONFIG_FEATURE_SYSLOG=y
 # CONFIG_PIE is not set
 # CONFIG_NOMMU is not set
 # CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set
 # CONFIG_FEATURE_INDIVIDUAL is not set
 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
-# CONFIG_LFS is not set
 CONFIG_CROSS_COMPILER_PREFIX=""
 CONFIG_SYSROOT=""
 CONFIG_EXTRA_CFLAGS=""
 CONFIG_EXTRA_LDFLAGS=""
 CONFIG_EXTRA_LDLIBS=""
+# CONFIG_USE_PORTABLE_CODE is not set
+# CONFIG_STACK_OPTIMIZATION_386 is not set
 
 #
 # Installation Options ("make install" behavior)
@@ -77,7 +79,7 @@ CONFIG_NO_DEBUG_LIB=y
 # CONFIG_EFENCE is not set
 
 #
-# Busybox Library Tuning
+# Library Tuning
 #
 # CONFIG_FEATURE_USE_BSS_TAIL is not set
 # CONFIG_FEATURE_RTMINMAX is not set
@@ -89,7 +91,7 @@ CONFIG_MD5_SMALL=1
 CONFIG_SHA3_SMALL=1
 # CONFIG_FEATURE_FAST_TOP is not set
 # CONFIG_FEATURE_ETC_NETWORKS is not set
-CONFIG_FEATURE_USE_TERMIOS=y
+# CONFIG_FEATURE_ETC_SERVICES is not set
 # CONFIG_FEATURE_EDITING is not set
 CONFIG_FEATURE_EDITING_MAX_LEN=0
 # CONFIG_FEATURE_EDITING_VI is not set
@@ -100,6 +102,7 @@ CONFIG_FEATURE_EDITING_HISTORY=0
 # CONFIG_FEATURE_TAB_COMPLETION is not set
 # CONFIG_FEATURE_USERNAME_COMPLETION is not set
 # CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
+# CONFIG_FEATURE_EDITING_WINCH is not set
 # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
 # CONFIG_L

[tor-commits] [webwml/master] fix links in include/README

2018-09-13 Thread hiro 
commit 455b29bfb3e8e806971e34739b93ef151704ea6d
Author: traumschule 
Date:   Tue Sep 4 18:41:41 2018 +0200

fix links in include/README
---
 include/README | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/include/README b/include/README
index 676e8387..05a00f3c 100644
--- a/include/README
+++ b/include/README
@@ -2,8 +2,8 @@ Here's a brief overview of how our wml set-up works.
 
 
 Here's a typical wml file:
-http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/docs/en/bridges.wml
-https://gitweb.torproject.org/project/web/webwml.git/docs/en/bridges.wml
+https://gitweb.torproject.org/project/web/webwml.git/tree/docs/en/bridges.wml
+http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/tree/docs/en/bridges.wml
 
 The top of the file has:
 
@@ -26,13 +26,16 @@ and the middle is standard html, plus a few extra tags like
 pages when they exist. So that wml page produces this html page:
 https://www.torproject.org/bridges aka
 https://www.torproject.org/bridges.html.en
+https://www.torproject.org/docs/bridges
 http://expyuzz4wqqyqhjn.onion/docs/bridges
 
 Then head.wmi and foot.wmi are just other mostly-html files you import
 to handle the repeat parts of each page (well, that plus some embedded
 perl scripts to generate some of the static content).
-http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/include/head.wmi
-http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/include/foot.wmi
+https://gitweb.torproject.org/project/web/webwml.git/tree/include/head.wmi
+http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/tree/include/head.wmi
+https://gitweb.torproject.org/project/web/webwml.git/tree/include/foot.wmi
+http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/tree/include/foot.wmi
 
 You can basically ignore the wml part of them, and to a first
 approximation just think of them as more html.
@@ -42,12 +45,13 @@ So in summary, wml is like html with a bit more markup.
 
 
 Where it gets interesting is the download page:
-http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/download/en/download-easy.wml
+https://gitweb.torproject.org/project/web/webwml.git/tree/download/en/download-easy.wml
+http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/tree/download/en/download-easy.wml
 
 It has the standard header and footer section, but in the body of the page
 it includes links like http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/include/versions.wmi
-
+https://gitweb.torproject.org/project/web/webwml.git/tree/include/versions.wmi
+http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/tree/include/versions.wmi



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

[tor-commits] [webwml/master] signing-keys: replace some short with long ids

2018-09-13 Thread hiro 
commit 8057006c079517ccda531cc20d982888a29e92d6
Author: traumschule 
Date:   Sat Sep 1 04:58:23 2018 +0200

signing-keys: replace some short with long ids
---
 include/keys.txt | 10 +-
 include/keys.wmi | 12 
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/include/keys.txt b/include/keys.txt
index 81b881cb..a9868a58 100644
--- a/include/keys.txt
+++ b/include/keys.txt
@@ -1,8 +1,8 @@
 [Tor Browser releases]
 The Tor Browser Developers: 0x4E2C6E8793298290
-Mike Perry: 0x0E3A92E4
+Mike Perry: 0x29846B3C683686CC
 Georg Koppen: 0x4B7C3223
-Nicolas Vigier: 0xD0220E4B
+Nicolas Vigier: 0xE5B81856D0220E4B
 Linus Nordberg: 0x23291265
 Arthur Edelstein: 0xD752F538C0D38C3A
 
@@ -14,13 +14,13 @@ Nick Mathewson: 0xFE43009C4607B1FB, 
0x6AFEE6D49E92B601(signing key)
 Nick Mathewson: 0x165733EA, 0x8D29319A(signing key)
 
 [deb.torproject.org repositories and archives]
-Tor Project Archive: 0x886DDD89
+Tor Project Archive: 0xEE8CBC9E886DDD89
 
 [Arm releases]
 Damian Johnson: 0x9ABBEEC6
 
 [Tails live system releases]
-The Tails team: 0x58ACD84F
+The Tails team: 0xDBB802B258ACD84F
 
 [Torsocks releases]
 David Goulet: 0x42E86A2A11F48D36
@@ -29,4 +29,4 @@ David Goulet: 0x42E86A2A11F48D36
 Sukhbir Singh: 0xB01C8B006DA77FAA
 
 [other]
-Peter Palfrader: 0xC82E0039, 0xE1DEC577(subkey)
+Peter Palfrader: 0x62AF4031C82E0039
diff --git a/include/keys.wmi b/include/keys.wmi
index 89bfab17..9bb30369 100644
--- a/include/keys.wmi
+++ b/include/keys.wmi
@@ -1,15 +1,15 @@
 #!/usr/bin/env wml
 The signing keys we use are:
 
-The Tor Browser Developers (0x4E2C6E8793298290), Mike Perry (0x0E3A92E4), 
Georg Koppen (0x4B7C3223), Nicolas Vigier (0xD0220E4B), Linus Nordberg 
(0x23291265), Arthur Edelstein (0xD752F538C0D38C3A) sign Tor Browser 
releases
+The Tor Browser Developers (0x4E2C6E8793298290), Mike Perry 
(0x29846B3C683686CC), Georg Koppen (0x4B7C3223), Nicolas Vigier 
(0xE5B81856D0220E4B), Linus Nordberg (0x23291265), Arthur Edelstein 
(0xD752F538C0D38C3A) sign Tor Browser releases
 Roger Dingledine (0x28988BF5 and 0x19F78451), Nick Mathewson (0x165733EA 
with its signing key 0x8D29319A) sign Tor source tarballs
 Nick Mathewson (0x165733EA with its signing key 0x8D29319A) signed 
older Tor tarballs
-Tor Project Archive (0x886DDD89) signs deb.torproject.org 
repositories and archives
+Tor Project Archive (0xEE8CBC9E886DDD89) signs deb.torproject.org 
repositories and archives
 Damian Johnson (0x9ABBEEC6) signs Arm releases
-The Tails team (0x58ACD84F) signs Tails live system 
releases
+The Tails team (0xDBB802B258ACD84F) signs Tails live system 
releases
 David Goulet (0x42E86A2A11F48D36) signs Torsocks 
releases
 Sukhbir Singh (0xB01C8B006DA77FAA) signs TorBirdy 
releases
-Other developers include Peter Palfrader (0xC82E0039 with its subkey 
0xE1DEC577).
+Other developers include Peter Palfrader (0x62AF4031C82E0039).
 
 Fingerprints
 The fingerprints for the keys are:
@@ -180,8 +180,4 @@ uid   [ unknown] Peter Palfrader 

 sub   rsa2048/0x8602C8203872331F 2014-05-04 [S] [expires: 2020-09-01]
 sub   rsa2048/0xE377AED938E4E080 2014-05-04 [E] [expires: 2020-09-01]
 
-pub   rsa4096/0x7675B62DC82E0039 2014-06-16 [SCEA] [revoked: 2016-08-16]
-  Key fingerprint = A110 43D3 C8A6 395D DDD0  EE85 7675 B62D C82E 0039
-uid   [ revoked] Peter Palfrader
-
 



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

[tor-commits] [webwml/master] signing-keys: generate fingerprints from script (#22637)

2018-09-13 Thread hiro 
commit d6608f6f949b0f7e4a9a0eabe3343ad5d3f4ef40
Author: traumschule 
Date:   Sat Sep 1 04:46:15 2018 +0200

signing-keys: generate fingerprints from script (#22637)

  To update docs/en/singing-keys.wmi execute the perl script
  docs/en/update_signing-keys.pl and commit include/keys.wmi

  Signing keys are stored in include/keys.txt
---
 docs/en/signing-keys.wml   | 140 +-
 docs/en/update_signing-keys.pl | 116 +
 include/keys.txt   |  32 +++
 include/keys.wmi   | 187 +
 4 files changed, 336 insertions(+), 139 deletions(-)

diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml
index d08b4033..42d7f3f7 100644
--- a/docs/en/signing-keys.wml
+++ b/docs/en/signing-keys.wml
@@ -12,145 +12,7 @@
 Which PGP keys sign which packages
 
 
-The signing keys we use are:
-
-The Tor Browser Developers (0x4E2C6E8793298290),
-Mike Perry (0x0E3A92E4), Georg Koppen (0x4B7C3223),
-Nicolas Vigier (0xD0220E4B), Linus Nordberg (0x23291265)
-and Arthur Edelstein (0xD752F538C0D38C3A)
-sign the Tor Browser releases.
-Roger Dingledine (0x28988BF5 and 0x19F78451) or Nick Mathewson
- (0xFE43009C4607B1FB with signing key 0x6AFEE6D49E92B601)
- sign the Tor source code tarballs. (Nick's old key was 0x165733EA
- with signing key 0x8D29319A; it signed older tarballs.)
-Tor Project Archive (0x886DDD89) signs the deb.torproject.org
-repositories and archives.
-Damian Johnson (0x9ABBEEC6) signs Arm releases.
-The Tails team (0x58ACD84F) signs the Tails live system releases.
-David Goulet (0x42E86A2A11F48D36) signs Torsocks releases.
-Sukhbir Singh (0xB01C8B006DA77FAA) signs Tor Messenger and TorBirdy 
releases.
-Other developers include Peter Palfrader (0xC82E0039, or its
-subkey 0xE1DEC577).
-
-
-The fingerprints for the keys should be:
-
-
-pub   1024D/28988BF5 2000-02-27
-  Key fingerprint = B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5
-uid  Roger Dingledine 
-
-pub   4096R/19F78451 2010-05-07
-  Key fingerprint = F65C E37F 04BA 5B36 0AE6  EE17 C218 5258 19F7 8451
-uid  Roger Dingledine 
-sub   4096R/B0E5067D 2015-06-10 [expires: 2016-06-09]
-
-pub   4096R/FE43009C4607B1FB 2016-09-21 [expires: 2019-09-21]
-  Key fingerprint = 2133 BC60 0AB1 33E1 D826  D173 FE43 009C 4607 B1FB
-uid  Nick Mathewson 
-uid  Nick Mathewson 
-uid  Nick Mathewson 
-uid  Nick Mathewson 
-sub   4096R/6AFEE6D49E92B601 2016-09-23 [expires: 2018-09-23]
-sub   4096R/91DDED0286AC8BFF 2016-09-23 [expires: 2018-09-23]
-
-pub   3072R/165733EA 2004-07-03
-  Key fingerprint = B35B F85B F194 89D0 4E28  C33C 2119 4EBB 1657 33EA
-uid  Nick Mathewson 
-uid  Nick Mathewson 
-uid  Nick Mathewson 
-sub   3072R/8D29319A 2004-07-03
-sub   3072R/F25B8E5E 2004-07-03
-
-pub   2048R/63FEE659 2003-10-16
-  Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659
-uid  Erinn Clark 
-sub   2048R/EB399FD7 2003-10-16
-
-pub   1024D/F1F5C9B5 2010-02-03
-  Key fingerprint = C2E3 4CFC 13C6 2BD9 2C75  79B5 6B8A AEB1 F1F5 C9B5
-uid  Erinn Clark 
-sub   1024g/7828F26A 2010-02-03
-
-pub   2048R/886DDD89 2009-09-04 [expires: 2020-08-29]
-  Key fingerprint = A3C4 F0F9 79CA A22C DBA8  F512 EE8C BC9E 886D DD89
-uid  deb.torproject.org archive signing key
-sub   2048R/219EC810 2009-09-04 [expires: 2018-08-30]
-
-pub   1024D/9ABBEEC6 2009-06-17
-  Key fingerprint = 6827 8CC5 DD2D 1E85 C4E4  5AD9 0445 B7AB 9ABB EEC6
-uid  Damian Johnson 
-sub   2048g/146276B2 2009-06-17
-sub   2048R/87F30690 2010-08-07
-
-pub   8192R/683686CC 2013-09-11
-  Key fingerprint = C963 C21D 6356 4E2B 10BB  335B 2984 6B3C 6836 86CC
-uid  Mike Perry (Regular use key) 

-sub   4096R/0F129402 2015-09-07 [expires: 2016-09-11]
-sub   4096R/ACC0A961 2015-09-07 [expires: 2016-09-11]
-
-pub   4096R/C5AA446D 2010-07-14
-  Key fingerprint = 261C 5FBE 7728 5F88 FB0C  3432 66C8 C2D7 C5AA 446D
-uid  Sebastian Hahn 
-sub   2048R/A2499719 2010-07-14
-sub   2048R/140C961B 2010-07-14
-
-pub   4096R/C82E0039 2003-03-24
-  Key fingerprint = 25FC 1614 B8F8 7B52 FF2F  99B9 62AF 4031 C82

[tor-commits] [webwml/master] Merge branch 'signing-keys'

2018-09-13 Thread hiro 
commit daa743880552e660862c4ba4ab102317d788f783
Merge: 8c324824 455b29bf
Author: hiro 
Date:   Thu Sep 13 15:58:28 2018 +0200

Merge branch 'signing-keys'

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

[tor-commits] [webwml/master] update links in README and include/README

2018-09-13 Thread hiro 
commit 6716b35669ff8979b0c66f078aeb0875c0fac33b
Author: traumschule 
Date:   Fri Aug 31 14:04:32 2018 +0200

update links in README and include/README
---
 README.md  |  2 ++
 include/README | 12 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 1d29e191..6fea7568 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,8 @@ You should now be able to point your browser at the locally 
generated site...
 
 file:///home/atagar/Desktop/tor/webwml/getinvolved/volunteer.html.en
 
+For details on WML see
+http://www.shlomifish.org/open-source/projects/website-meta-language/
 
 ### Troubleshooting the build
 
diff --git a/include/README b/include/README
index 580b20fb..676e8387 100644
--- a/include/README
+++ b/include/README
@@ -2,7 +2,8 @@ Here's a brief overview of how our wml set-up works.
 
 
 Here's a typical wml file:
-https://svn.torproject.org/svn/website/trunk/en/bridges.wml
+http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/docs/en/bridges.wml
+https://gitweb.torproject.org/project/web/webwml.git/docs/en/bridges.wml
 
 The top of the file has:
 
@@ -25,12 +26,13 @@ and the middle is standard html, plus a few extra tags like
 pages when they exist. So that wml page produces this html page:
 https://www.torproject.org/bridges aka
 https://www.torproject.org/bridges.html.en
+http://expyuzz4wqqyqhjn.onion/docs/bridges
 
 Then head.wmi and foot.wmi are just other mostly-html files you import
 to handle the repeat parts of each page (well, that plus some embedded
 perl scripts to generate some of the static content).
-https://svn.torproject.org/svn/website/trunk/include/head.wmi
-https://svn.torproject.org/svn/website/trunk/en/foot.wmi
+http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/include/head.wmi
+http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/include/foot.wmi
 
 You can basically ignore the wml part of them, and to a first
 approximation just think of them as more html.
@@ -40,12 +42,12 @@ So in summary, wml is like html with a bit more markup.
 
 
 Where it gets interesting is the download page:
-https://svn.torproject.org/svn/website/trunk/en/easy-download.wml
+http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/download/en/download-easy.wml
 
 It has the standard header and footer section, but in the body of the page
 it includes links like https://svn.torproject.org/svn/website/trunk/include/versions.wmi
+http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/include/versions.wmi
 



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

[tor-commits] [translation/support-portal] Update translations for support-portal

2018-09-13 Thread translation 
commit 1c3e538861e3f3d4d5676e22274cd0c42c521bc8
Author: Translation commit bot 
Date:   Thu Sep 13 12:48:59 2018 +

Update translations for support-portal
---
 contents+pt_BR.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+pt_BR.po b/contents+pt_BR.po
index 78419664d..589890b02 100644
--- a/contents+pt_BR.po
+++ b/contents+pt_BR.po
@@ -4372,7 +4372,7 @@ msgstr ""
 #: http//localhost/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.description)
 msgid "$ deb-src http://deb.torproject.org/torproject.org  main"
-msgstr ""
+msgstr "$ deb-src http://deb.torproject.org/torproject.org  main"
 
 #: http//localhost/tbb/tbb-36/
 #: (content/tbb/tbb-36/contents+en.lrquestion.description)

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

[tor-commits] [torbutton/master] Bug 27478: Torbutton icons for dark theme

2018-09-13 Thread gk 
commit 9156c5564a5da6bd8e17eab094d655034e4135b6
Author: Arthur Edelstein 
Date:   Thu Sep 13 02:18:41 2018 -0700

Bug 27478: Torbutton icons for dark theme
---
 src/chrome/skin/torbutton-dark-update-needed.svg | 13 +
 src/chrome/skin/torbutton-dark.svg   |  9 +
 src/chrome/skin/torbutton.css| 15 +++
 3 files changed, 37 insertions(+)

diff --git a/src/chrome/skin/torbutton-dark-update-needed.svg 
b/src/chrome/skin/torbutton-dark-update-needed.svg
new file mode 100644
index ..44df4a00
--- /dev/null
+++ b/src/chrome/skin/torbutton-dark-update-needed.svg
@@ -0,0 +1,13 @@
+
+http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/chrome/skin/torbutton-dark.svg 
b/src/chrome/skin/torbutton-dark.svg
new file mode 100644
index ..55d633e8
--- /dev/null
+++ b/src/chrome/skin/torbutton-dark.svg
@@ -0,0 +1,9 @@
+
+http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+
+
+
+
+
+
diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css
index cf90ae6d..928ba93d 100644
--- a/src/chrome/skin/torbutton.css
+++ b/src/chrome/skin/torbutton.css
@@ -6,10 +6,21 @@
 list-style-image: url("chrome://torbutton/skin/torbutton.svg");
   }
 }
+@keyframes blink-update-dark {
+  0% {
+list-style-image: 
url("chrome://torbutton/skin/torbutton-dark-update-needed.svg");
+  }
+  100% {
+list-style-image: url("chrome://torbutton/skin/torbutton-dark.svg");
+  }
+}
 
 #torbutton-button {
   list-style-image: url("chrome://torbutton/skin/torbutton.svg");
 }
+toolbar[brighttext] #torbutton-button {
+  list-style-image: url("chrome://torbutton/skin/torbutton-dark.svg");
+}
 #torbutton-button[tbstatus="on"] {
   opacity: 1.0;
 }
@@ -20,6 +31,10 @@
   opacity: 1.0;
   animation: blink-update normal 1s infinite ease-in-out;
 }
+toolbar[brighttext] #torbutton-button[tbUpdateNeeded="true"] {
+  opacity: 1.0;
+  animation: blink-update-dark normal 1s infinite ease-in-out;
+}
 
 #torbutton-button-tb {
   list-style-image: url("chrome://torbutton/skin/torbutton.svg");

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

[tor-commits] [tor/master] conn: Fix memleaks in retry_all_listeners

2018-09-13 Thread nickm 
commit 4b646e30d8364e56fb6ae4ce5850f01e714eabcb
Author: David Goulet 
Date:   Wed Sep 12 17:51:52 2018 -0400

conn: Fix memleaks in retry_all_listeners

Fixes #27670

Signed-off-by: David Goulet 
---
 src/core/mainloop/connection.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c
index 3c057ad14..7ef7423b1 100644
--- a/src/core/mainloop/connection.c
+++ b/src/core/mainloop/connection.c
@@ -2900,6 +2900,9 @@ retry_all_listeners(smartlist_t *new_conns, int 
close_all_noncontrol)
   } SMARTLIST_FOREACH_END(conn);
 
   smartlist_free(listeners);
+  /* Cleanup any remaining listener replacement. */
+  SMARTLIST_FOREACH(replacements, listener_replacement_t *, r, tor_free(r));
+  smartlist_free(replacements);
 
   if (old_or_port != router_get_advertised_or_port(options) ||
   old_or_port_ipv6 != router_get_advertised_or_port_by_af(options,

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

[tor-commits] [tor/master] Report UNIX connection addresses that we opened correctly.

2018-09-13 Thread nickm 
commit fed2c26e6028ee2ab77ad47ce91b6676fc2b31a2
Author: Nick Mathewson 
Date:   Wed Sep 12 17:42:24 2018 -0400

Report UNIX connection addresses that we opened correctly.

This is an aside on ticket27670.
---
 src/core/mainloop/connection.c | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c
index ffc9010fb..3c057ad14 100644
--- a/src/core/mainloop/connection.c
+++ b/src/core/mainloop/connection.c
@@ -1506,8 +1506,13 @@ connection_listener_new(const struct sockaddr 
*listensockaddr,
*/
   connection_check_oos(get_n_open_sockets(), 0);
 
-  log_notice(LD_NET, "Opened %s on %s",
- conn_type_to_string(type), fmt_addrport(&addr, usePort));
+  if (conn->socket_family == AF_UNIX) {
+log_notice(LD_NET, "Opened %s on %s",
+   conn_type_to_string(type), conn->address);
+  } else {
+log_notice(LD_NET, "Opened %s on %s",
+   conn_type_to_string(type), fmt_addrport(&addr, usePort));
+  }
   return conn;
 
  err:



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

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

2018-09-13 Thread translation 
commit 5312d60a3c25e93b960d26bbffeec0e903406934
Author: Translation commit bot 
Date:   Thu Sep 13 11:16:07 2018 +

Update translations for tails-misc
---
 id.po | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/id.po b/id.po
index e44a85849..764ae7715 100644
--- a/id.po
+++ b/id.po
@@ -8,6 +8,7 @@
 # Dwi Cahyono , 2015
 # Frengky Sinaga , 2016
 # Ibnu Daru Aji, 2014
+# ical, 2018
 # se7entime , 2015
 # L1Nus , 2014
 # Robert Dafis , 2018
@@ -19,8 +20,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-04 11:37+0200\n"
-"PO-Revision-Date: 2018-09-04 14:30+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-09-13 10:59+\n"
+"Last-Translator: ical\n"
 "Language-Team: Indonesian 
(http://www.transifex.com/otf/torproject/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,13 +58,13 @@ msgstr "Bantu kami memperbaiki kutu!\nBaca panduan pe
 msgid ""
 "You can install additional software automatically from your persistent "
 "storage when starting Tails."
-msgstr ""
+msgstr "Anda dapat memasang perangkat lunak tambahan secara otomatis dari 
tempat penyimpanan tetap saat memulai Tails."
 
 #: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:77
 msgid ""
 "The following software is installed automatically from your persistent "
 "storage when starting Tails."
-msgstr ""
+msgstr "Perangkat lunak ini terpasang secara otomatis dari tempat penyimpanan 
tetap saat memulai Tails."
 
 #: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:132
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:169
@@ -71,11 +72,11 @@ msgid ""
 "To add more, install some software using Synaptic Package Manager or APT on the command line."
-msgstr ""
+msgstr "Untuk menambah, pasang perangkat lunak menggunakan Synaptic Package Manager atau APT pada baris perintah."
 
 #: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:151
 msgid "_Create persistent storage"
-msgstr ""
+msgstr "_Buat tempat penyimpanan tetap"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:57
 msgid "Persistence is disabled for Electrum"
@@ -195,7 +196,7 @@ msgstr "menambah {paket} untuk perangkat lunak tambahanmu"
 msgid ""
 "To install it automatically from your persistent storage when starting "
 "Tails."
-msgstr ""
+msgstr "Untuk memasangnya secara otomatis dari tempat penyimpanan tetap Anda 
saat memulai Tails."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:285
 msgid "Install Every Time"
@@ -210,13 +211,13 @@ msgstr "Memasang Hanya Sekali"
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:320
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:355
 msgid "The configuration of your additional software failed."
-msgstr ""
+msgstr "Konfigurasi pada perangkat lunak tambahan Anda gagal."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:311
 msgid ""
 "To install it automatically when starting Tails, you can create a persistent"
 " storage and activate the Additional Software feature."
-msgstr ""
+msgstr "Untuk memasang secara otomatis saat memulai Tails, Anda dapat membuat 
tempat penyimpanan tetap dan mengaktifkan fitur Perangkat Lunak 
Tambahan."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:314
 msgid "Create Persistent Storage"

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

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

2018-09-13 Thread translation 
commit b9b50098ed4064f493550fd44d39c7f425ea8282
Author: Translation commit bot 
Date:   Thu Sep 13 10:49:02 2018 +

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

diff --git a/id/browserOnboarding.properties b/id/browserOnboarding.properties
index a6fea1be3..471a73b8a 100644
--- a/id/browserOnboarding.properties
+++ b/id/browserOnboarding.properties
@@ -17,7 +17,7 @@ onboarding.tour-tor-network.title=Mengelilingi jaringan yang 
terdesentralisasi.
 onboarding.tour-tor-network.description=Peramban Tor menghubungkan Anda ke 
jaringan Tor yang dijalankan oleh ribuan relawan di seluruh dunia. Tidak 
seperti VPN, tidak ada satu titik kesalahan atau entitas sentral yang perlu 
anda percaya untuk menikmati internet secara privat.
 onboarding.tour-tor-network.button=Go to Circuit Display
 
-onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display=Tampilan Sirkuit
 onboarding.tour-tor-circuit-display.title=Lihat jalan Anda.
 onboarding.tour-tor-circuit-display.description=Untuk setiap domain yang Anda 
kunjungi, lalu lintas anda disampaikan dan terenkripsi dalam sebuah sirkuit 
melalui tiga relay Tor dari seluruh dunia. Tidak ada situs web mengetahui dari 
mana anda terhubung. Anda dapat meminta sebuah sirkuit baru dengan klik 
'Sirkuit Baru untuk Situs ini' pada Tampilan Sirkuit kami.
 onboarding.tour-tor-circuit-display.button=See My Path
@@ -47,8 +47,8 @@ onboarding.tor-circuit-display.three-of-three=3 of 3
 onboarding.tor-circuit-display.intro.title=How do circuits work?
 onboarding.tor-circuit-display.intro.msg=Sirkuit terbuat dari relay yang 
ditentukan secara acak, yang merupakan komputer di seluruh dunia yang 
terkonfigurasi untuk mengalihkan lalu lintas Tor. Sirkuit mengizinkan anda 
untuk menjelajah secara privat dan terhubung ke layanan onion.
 
-onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.title=Tampilan Sirkuit
 onboarding.tor-circuit-display.diagram.msg=Diagram ini menunjukkan relay-relay 
yang membuat sirkuit untuk situs web ini. Untuk mencegah pengkaitan antara 
aktivitas pada situs berbeda, setiap situs web mendapatkan sirkuit yang berbeda.
 
-onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
-onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect 
to the website you’re trying to visit or it is not loading properly, then you 
can use this button to reload the site with a new circuit.
+onboarding.tor-circuit-display.new-circuit.title=Apakah Anda menginginkan 
sirkuit baru?
+onboarding.tor-circuit-display.new-circuit.msg=Bila Anda tidak berhasil 
terhubung ke situs web yang Anda coba kunjungi atau situs web tersebut tidak 
memuat dengan benar, maka Anda bisa menggunakan tombol ini untuk membuka ulang 
situs tersebut dengan sirkuit baru.

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

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2018-09-13 Thread translation 
commit db4f1d12b40b0917845dd2a5fdb7c4534a298fc7
Author: Translation commit bot 
Date:   Thu Sep 13 10:15:04 2018 +

Update translations for abouttor-homepage
---
 ko/aboutTor.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ko/aboutTor.dtd b/ko/aboutTor.dtd
index 4dd465adb..74bc503e4 100644
--- a/ko/aboutTor.dtd
+++ b/ko/aboutTor.dtd
@@ -24,5 +24,5 @@
 
 https://www.torproject.org/getinvolved/volunteer.html.en";>
 
-
-
+
+

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

[tor-commits] [torbutton/master] Bug 27506: Move status version to UL corner for RTL locales

2018-09-13 Thread gk 
commit 2754f4d06268c18e9121de41e436335a6946efc5
Author: Arthur Edelstein 
Date:   Thu Sep 13 00:24:00 2018 -0700

Bug 27506: Move status version to UL corner for RTL locales

We use both offset-inline-end and inset-inline-end because the
former is supported in Firefox 60 and the latter is supported
in Firefox 63 and later.
---
 src/chrome/skin/aboutTor.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css
index c402bbed..2e6bab75 100644
--- a/src/chrome/skin/aboutTor.css
+++ b/src/chrome/skin/aboutTor.css
@@ -58,12 +58,13 @@ body:not([initialized]) {
 #torstatus-version {
   position: absolute;
   top: 6px;
-  right: 6px;
+  offset-inline-end: 6px;
+  inset-inline-end: 6px;
   height: 30px;
   width: 200px;
   font-size: 15px;
   white-space: pre-wrap;
-  text-align: right;
+  text-align: end;
 }
 
 a {

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

[tor-commits] [torbutton/master] Bug 27663: Add New Identity menuitem again

2018-09-13 Thread gk 
commit 2ba36eb269b86ca90835c3e39f6b4a7546dd76ba
Author: Georg Koppen 
Date:   Wed Sep 12 14:56:36 2018 +

Bug 27663: Add New Identity menuitem again

Moving the New Identity button to the hamburger menu without having the
redesign of our security controls in place and without having a proper
guidance for where we moved it to is confusing. Let's revert that
decision until we have all required pieces ready.

We omit the key attribute from the menu item to avoid doing a New
Identity twice if users press Ctrl+Shift+u.
---
 src/chrome/content/popup.xul|  6 ++
 src/chrome/content/torbutton.js | 12 
 2 files changed, 18 insertions(+)

diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul
index b4191e30..582593f6 100644
--- a/src/chrome/content/popup.xul
+++ b/src/chrome/content/popup.xul
@@ -15,6 +15,12 @@
  anchor="torbutton-button" position="after_start" >
 
   
+
+
 https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

<    1   2