December 2017 - tor-commits - lists.torproject.org

[tor/maint-0.3.2] fix check-changes warning
by nickm＠torproject.org 04 Dec '17

04 Dec '17

commit a5be2305e1217e58f355a690af96c8953a34023e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 4 14:01:52 2017 -0500 fix check-changes warning --- changes/bug23696 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug23696 b/changes/bug23696 index 11b38fd68..c5d18583d 100644 --- a/changes/bug23696 +++ b/changes/bug23696 @@ -1,5 +1,5 @@ o Minor bugfix (KIST scheduler): - Downgrade a warning to log info when the monotonic time diff is negative. This can happen on platform not supporting monotonic time. The - scheduler recovers from this without any problem. Fixes ticket 23969; + scheduler recovers from this without any problem. Fixes bug 23696; bugfix on 0.3.2.1-alpha.

1 0

[webwml/master] Fix #24233
by hiro＠torproject.org 04 Dec '17

04 Dec '17

commit 656a7a382335ee537a2fa1fd6980509f7414f09d Author: hiromipaw <hiro(a)torproject.org> Date: Mon Dec 4 19:49:09 2017 +0100 Fix #24233 --- include/donatehead.wmi | 4 +--- include/links.wmi | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/donatehead.wmi b/include/donatehead.wmi index 7115abaf..a1f616c5 100644 --- a/include/donatehead.wmi +++ b/include/donatehead.wmi @@ -34,9 +34,7 @@ </div> <ul id="navbar" class="nav navbar-nav navbar-right"> <li><a href="<page about/overview>">About</a></li> - <:{ - printf '<li><a href="https://donate.torproject.org/donor-faq">Questions?</a></li>' - }:> + <:{ printf '<li><a href="https://donate.torproject.org/donor-faq">Questions?</a></li>' }:> </ul> </div> </nav> diff --git a/include/links.wmi b/include/links.wmi index ce903703..601f57b8 100644 --- a/include/links.wmi +++ b/include/links.wmi @@ -13,7 +13,7 @@ <define-tag tbbrepo whitespace=delete>https://gitweb.torproject.org/torbrowser.git/blob_plain/HEAD:</define-tag> <define-tag specblob whitespace=delete>https://gitweb.torproject.org/torspec.git/tree/</define-tag> <define-tag doxygen whitespace=delete>https://doxygen.torproject.org/</define-tag> -<define-tag donatefaq whitespace=delete>https://donate.torproject.org/donor-faq</define-tag> +<define-tag donatefaq whitespace=delete>https://donate.torproject.org/donor-faq</define-tag> # Xinclude "locallinks.wmi"

1 0

[tor/master] sched: Downgrade warning log to info in KIST
by nickm＠torproject.org 04 Dec '17

04 Dec '17

commit ff6c8cf8617637e0fef28268a3e8ee0b1b4d98fb Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Dec 4 12:22:02 2017 -0500 sched: Downgrade warning log to info in KIST Some platforms don't have good monotonic time support so don't warn when the diff between the last run of the scheduler time and now is negative. The scheduler recovers properly from this so no need to be noisy. Fixes #23696 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug23696 | 5 +++++ src/or/scheduler_kist.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/changes/bug23696 b/changes/bug23696 new file mode 100644 index 000000000..11b38fd68 --- /dev/null +++ b/changes/bug23696 @@ -0,0 +1,5 @@ + o Minor bugfix (KIST scheduler): + - Downgrade a warning to log info when the monotonic time diff is + negative. This can happen on platform not supporting monotonic time. The + scheduler recovers from this without any problem. Fixes ticket 23969; + bugfix on 0.3.2.1-alpha. diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index d1726ba34..fea92705d 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -525,9 +525,13 @@ kist_scheduler_schedule(void) monotime_get(&now); /* If time is really monotonic, we can never have now being smaller than the - * last scheduler run. The scheduler_last_run at first is set to 0. */ + * last scheduler run. The scheduler_last_run at first is set to 0. + * Unfortunately, not all platforms guarantee monotonic time so we log at + * info level but don't make it more noisy. */ diff = monotime_diff_msec(&scheduler_last_run, &now); - IF_BUG_ONCE(diff < 0) { + if (diff < 0) { + log_info(LD_SCHED, "Monotonic time between now and last run of scheduler " + "is negative: %" PRId64 ". Setting diff to 0.", diff); diff = 0; } if (diff < sched_run_interval) {

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 04 Dec '17

04 Dec '17

commit 70b19894aef65f570840d6ed37e3398e7cb748e6 Merge: f50d64b62 ff6c8cf86 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 4 13:23:52 2017 -0500 Merge branch 'maint-0.3.2' changes/bug23696 | 5 +++++ src/or/scheduler_kist.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 04 Dec '17

04 Dec '17

commit 19e01f0cbcdf09ddcbf9a54ce3a3d601f42ea7a9 Merge: fe12c9756 ff6c8cf86 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 4 13:23:52 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23696 | 5 +++++ src/or/scheduler_kist.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.2] sched: Downgrade warning log to info in KIST
by nickm＠torproject.org 04 Dec '17

04 Dec '17

commit ff6c8cf8617637e0fef28268a3e8ee0b1b4d98fb Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Dec 4 12:22:02 2017 -0500 sched: Downgrade warning log to info in KIST Some platforms don't have good monotonic time support so don't warn when the diff between the last run of the scheduler time and now is negative. The scheduler recovers properly from this so no need to be noisy. Fixes #23696 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug23696 | 5 +++++ src/or/scheduler_kist.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/changes/bug23696 b/changes/bug23696 new file mode 100644 index 000000000..11b38fd68 --- /dev/null +++ b/changes/bug23696 @@ -0,0 +1,5 @@ + o Minor bugfix (KIST scheduler): + - Downgrade a warning to log info when the monotonic time diff is + negative. This can happen on platform not supporting monotonic time. The + scheduler recovers from this without any problem. Fixes ticket 23969; + bugfix on 0.3.2.1-alpha. diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index d1726ba34..fea92705d 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -525,9 +525,13 @@ kist_scheduler_schedule(void) monotime_get(&now); /* If time is really monotonic, we can never have now being smaller than the - * last scheduler run. The scheduler_last_run at first is set to 0. */ + * last scheduler run. The scheduler_last_run at first is set to 0. + * Unfortunately, not all platforms guarantee monotonic time so we log at + * info level but don't make it more noisy. */ diff = monotime_diff_msec(&scheduler_last_run, &now); - IF_BUG_ONCE(diff < 0) { + if (diff < 0) { + log_info(LD_SCHED, "Monotonic time between now and last run of scheduler " + "is negative: %" PRId64 ". Setting diff to 0.", diff); diff = 0; } if (diff < sched_run_interval) {

1 0

[tor/maint-0.3.2] sched: Downgrade warning log to info in KIST
by nickm＠torproject.org 04 Dec '17

04 Dec '17

commit ff6c8cf8617637e0fef28268a3e8ee0b1b4d98fb Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Dec 4 12:22:02 2017 -0500 sched: Downgrade warning log to info in KIST Some platforms don't have good monotonic time support so don't warn when the diff between the last run of the scheduler time and now is negative. The scheduler recovers properly from this so no need to be noisy. Fixes #23696 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug23696 | 5 +++++ src/or/scheduler_kist.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/changes/bug23696 b/changes/bug23696 new file mode 100644 index 000000000..11b38fd68 --- /dev/null +++ b/changes/bug23696 @@ -0,0 +1,5 @@ + o Minor bugfix (KIST scheduler): + - Downgrade a warning to log info when the monotonic time diff is + negative. This can happen on platform not supporting monotonic time. The + scheduler recovers from this without any problem. Fixes ticket 23969; + bugfix on 0.3.2.1-alpha. diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index d1726ba34..fea92705d 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -525,9 +525,13 @@ kist_scheduler_schedule(void) monotime_get(&now); /* If time is really monotonic, we can never have now being smaller than the - * last scheduler run. The scheduler_last_run at first is set to 0. */ + * last scheduler run. The scheduler_last_run at first is set to 0. + * Unfortunately, not all platforms guarantee monotonic time so we log at + * info level but don't make it more noisy. */ diff = monotime_diff_msec(&scheduler_last_run, &now); - IF_BUG_ONCE(diff < 0) { + if (diff < 0) { + log_info(LD_SCHED, "Monotonic time between now and last run of scheduler " + "is negative: %" PRId64 ". Setting diff to 0.", diff); diff = 0; } if (diff < sched_run_interval) {

1 0

[webwml/master] Fix 3 links about current Tor network usage/size
by hiro＠torproject.org 04 Dec '17

04 Dec '17

commit f43669fce567be541ce2269b67729ab012b753d6 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Tue Jun 13 22:25:04 2017 -0400 Fix 3 links about current Tor network usage/size --- docs/en/faq.wml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/docs/en/faq.wml b/docs/en/faq.wml index a97dffdc..94c2b7ae 100644 --- a/docs/en/faq.wml +++ b/docs/en/faq.wml @@ -682,15 +682,12 @@ with more funding?</a></h3> <p> The Tor network's <a - -href="https://metrics.torproject.org/network.html#networksize">several - thousand</a> relays push <a - href="https://metrics.torproject.org/network.html#bandwidth">over - 7.5GB per second on average</a>. We have <a - -href="https://metrics.torproject.org/users.html#direct-users">millions of - daily users</a>. But the Tor network is not yet - self-sustaining. +href="https://metrics.torproject.org/networksize.html">serveral thousand</a> + relays push <a +href="https://metrics.torproject.org/bandwidth.html">around 100 Gbps on +average</a>. We have <a +href="https://metrics.torproject.org/userstats-relay-country.html">millions of + daily users</a>. But the Tor network is not yet self-sustaining. </p> <p>

1 0

[webwml/master] typo serveral->several
by hiro＠torproject.org 04 Dec '17

04 Dec '17

commit cafc6b4a8a8259b739403000d2d3c19daebbde11 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Thu Jun 15 09:04:22 2017 -0400 typo serveral->several --- docs/en/faq.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/faq.wml b/docs/en/faq.wml index 94c2b7ae..608261bc 100644 --- a/docs/en/faq.wml +++ b/docs/en/faq.wml @@ -682,7 +682,7 @@ with more funding?</a></h3> <p> The Tor network's <a -href="https://metrics.torproject.org/networksize.html">serveral thousand</a> +href="https://metrics.torproject.org/networksize.html">several thousand</a> relays push <a href="https://metrics.torproject.org/bandwidth.html">around 100 Gbps on average</a>. We have <a

1 0

[webwml/master] Fix for ticket #22609 from pastly
by hiro＠torproject.org 04 Dec '17

04 Dec '17

commit 7217519424d1febfa0e919f3ccdbe95bbd3c7fb1 Merge: cafc6b4a bc2c3443 Author: hiromipaw <hiro(a)torproject.org> Date: Mon Dec 4 18:21:07 2017 +0100 Fix for ticket #22609 from pastly .gitignore | 2 +- .htaccess | 8 +- Makefile | 5 +- Makefile.common | 1 - README.md | 29 +- about/en/board.wml | 16 + about/en/contact.wml | 69 +- about/en/contributors.wml | 17 +- about/en/corepeople.wml | 1183 +++++-- about/en/gsoc.wml | 2 +- about/en/jobs-browserdeveloper.wml | 128 + about/en/jobs-developerandroid.wml | 131 + about/en/jobs-osdeveloperandroid.wml | 139 + about/en/jobs.wml | 15 +- about/en/overview.wml | 2 +- about/en/sponsors.wml | 20 +- about/en/torusers.wml | 47 +- css/bootstrap.min.css | 5 + css/donate-style.min.css | 1 + css/donation-banner.css | 113 + css/ie6.min.css | 1 + css/ie7-and-down.min.css | 1 + css/ie8-and-down.min.css | 1 + css/layout-rtl.min.css | 1 + css/layout.css | 11 + css/layout.min.css | 1 + css/master-rtl.css | 6 +- css/master-rtl.min.css | 1 + css/master.css | 6 +- css/master.min.css | 1 + css/people-table.css | 40 + css/reset.min.css | 1 + css/tbbproject.min.css | 1 + css/thankyou.min.css | 1 + css/typography-rtl.min.css | 1 + css/typography.min.css | 1 + docs/debian-selector.js | 20 +- docs/en/debian.wml | 46 +- docs/en/documentation.wml | 9 +- docs/en/faq-abuse.wml | 10 +- docs/en/faq.wml | 41 +- docs/en/hidden-services.wml | 162 +- docs/en/onion-services.wml | 162 + docs/en/sidenav.wmi | 6 +- docs/en/tor-doc-osx.wml | 28 +- docs/en/tor-hidden-service.wml | 251 +- docs/en/tor-onion-service.wml | 258 ++ docs/en/tor-relay-debian.wml | 12 +- docs/en/verifying-signatures.wml | 74 +- docs/torbutton/en/index.wml | 81 +- docs/torbutton/en/sidenav.wmi | 4 +- donate/en/donate-button.wml | 7 + donate/en/donate-options.wml | 19 +- donate/en/donate-pdr-hp.wml | 7 + donate/en/donate.wml | 7 + donate/en/donor-faq.wml | 2 +- donate/en/thankyou.wml | 41 - download/en/download-easy.wml | 18 +- download/en/download.wml | 38 +- en/index.wml | 12 +- en/navigation.wmi | 1 + getinvolved/en/volunteer.wml | 68 +- images/THS-1.png | Bin 56150 -> 0 bytes images/THS-2.png | Bin 63666 -> 0 bytes images/THS-3.png | Bin 72324 -> 0 bytes images/THS-4.png | Bin 71297 -> 0 bytes images/THS-5.png | Bin 73455 -> 0 bytes images/THS-6.png | Bin 60054 -> 0 bytes images/{icon-Arm.jpg => icon-Nyx.jpg} | Bin images/onion-hand.png | Bin 0 -> 69055 bytes images/people/agrabeli.png | Bin 0 -> 29509 bytes images/people/ailanthus.png | Bin 0 -> 40198 bytes images/people/antonela.png | Bin 0 -> 23267 bytes images/people/arlolra.png | Bin 0 -> 38865 bytes images/people/arma.png | Bin 0 -> 34872 bytes images/people/arthuredelstein.png | Bin 0 -> 37957 bytes images/people/asn.png | Bin 0 -> 26187 bytes images/people/atagar.png | Bin 0 -> 38415 bytes images/people/biella.png | Bin 0 -> 34947 bytes images/people/bparker.png | Bin 0 -> 21887 bytes images/people/cindy.png | Bin 0 -> 36456 bytes images/people/dawuud.png | Bin 0 -> 22257 bytes images/people/dgoulet.png | Bin 0 -> 14379 bytes images/people/donnchac.png | Bin 0 -> 25035 bytes images/people/ewyatt.png | Bin 0 -> 20553 bytes images/people/flexlibris.png | Bin 0 -> 34179 bytes images/people/gunner.png | Bin 0 -> 35025 bytes images/people/hellais.png | Bin 0 -> 40390 bytes images/people/hiro.png | Bin 0 -> 14842 bytes images/people/ian.png | Bin 0 -> 40460 bytes images/people/ilv.png | Bin 0 -> 38009 bytes images/people/inf0.png | Bin 0 -> 18667 bytes images/people/irl.png | Bin 0 -> 42121 bytes images/people/isabela.png | Bin 0 -> 14705 bytes images/people/isis.png | Bin 0 -> 36028 bytes images/people/jselon.png | Bin 0 -> 29698 bytes images/people/karsten.png | Bin 0 -> 37330 bytes images/people/kat5.png | Bin 0 -> 53700 bytes images/people/komlo.png | Bin 0 -> 32188 bytes images/people/linda.png | Bin 0 -> 40598 bytes images/people/ln5.png | Bin 0 -> 34926 bytes images/people/mcs.png | Bin 0 -> 30521 bytes images/people/meejah.png | Bin 0 -> 11186 bytes images/people/moritz.png | Bin 0 -> 43049 bytes images/people/mtigas.png | Bin 0 -> 39174 bytes images/people/n8fr8.png | Bin 0 -> 32079 bytes images/people/nickhopper.png | Bin 0 -> 38099 bytes images/people/nickm.png | Bin 0 -> 41516 bytes images/people/no_photo.png | Bin 0 -> 10668 bytes images/people/ohmygodel.png | Bin 0 -> 32230 bytes images/people/orig/agrabeli.jpg | Bin 0 -> 19745 bytes images/people/orig/ailanthus.jpg | Bin 0 -> 795358 bytes images/people/orig/antonela.jpeg | Bin 0 -> 12110 bytes images/people/orig/arlolra.jpg | Bin 0 -> 72136 bytes images/people/orig/arma.jpg | Bin 0 -> 74271 bytes images/people/orig/arthuredelstein.jpg | Bin 0 -> 18449 bytes images/people/orig/atagar.png | Bin 0 -> 116545 bytes images/people/orig/cindy.jpg | Bin 0 -> 210034 bytes images/people/orig/dawuud.jpg | Bin 0 -> 9640 bytes images/people/orig/dgoulet.png | Bin 0 -> 57781 bytes images/people/orig/donnchac.jpg | Bin 0 -> 138279 bytes images/people/orig/ewyatt.jpg | Bin 0 -> 59903 bytes images/people/orig/flexlibris.jpg | Bin 0 -> 615306 bytes images/people/orig/gunner.jpg | Bin 0 -> 722367 bytes images/people/orig/hellais.jpg | Bin 0 -> 47753 bytes images/people/orig/hiro.jpg | Bin 0 -> 12804 bytes images/people/orig/ian.jpg | Bin 0 -> 30787 bytes images/people/orig/inf0.jpg | Bin 0 -> 21090 bytes images/people/orig/isabela.jpg | Bin 0 -> 16817 bytes images/people/orig/isis.jpg | Bin 0 -> 46059 bytes images/people/orig/jselon.jpg | Bin 0 -> 33180 bytes images/people/orig/karsten.jpg | Bin 0 -> 90829 bytes images/people/orig/komlo.jpg | Bin 0 -> 23451 bytes images/people/orig/linda.jpg | Bin 0 -> 910787 bytes images/people/orig/ln5.jpg | Bin 0 -> 18819 bytes images/people/orig/meejah.svg | 59 + images/people/orig/moritz.png | Bin 0 -> 731576 bytes images/people/orig/n8fr8.jpg | Bin 0 -> 21843 bytes images/people/orig/nickhopper.jpg | Bin 0 -> 20252 bytes images/people/orig/ohmygodel.jpg | Bin 0 -> 25960 bytes images/people/orig/pepijn.jpg | Bin 0 -> 1025994 bytes images/people/orig/phoul.jpg | Bin 0 -> 14218 bytes images/people/orig/redshiftzero.jpg | Bin 0 -> 51523 bytes images/people/orig/robgjansen.jpg | Bin 0 -> 24939 bytes images/people/orig/robt.png | Bin 0 -> 689358 bytes images/people/orig/saint.jpg | Bin 0 -> 81825 bytes images/people/orig/serene.jpg | Bin 0 -> 42790 bytes images/people/orig/sjmurdoch.jpg | Bin 0 -> 115664 bytes images/people/orig/ssteele.jpg | Bin 0 -> 18889 bytes images/people/orig/stephw.jpeg | Bin 0 -> 370743 bytes images/people/orig/syverson.jpg | Bin 0 -> 729689 bytes images/people/orig/t0mmy.jpg | Bin 0 -> 50507 bytes images/people/orig/tjr.jpg | Bin 0 -> 91681 bytes images/people/orig/wseltzer.jpg | Bin 0 -> 6888 bytes images/people/pastly.png | Bin 0 -> 31851 bytes images/people/pepijn.png | Bin 0 -> 31866 bytes images/people/phoul.png | Bin 0 -> 5932 bytes images/people/ramy.png | Bin 0 -> 36799 bytes images/people/redshiftzero.png | Bin 0 -> 45395 bytes images/people/robgjansen.png | Bin 0 -> 33856 bytes images/people/robt.png | Bin 0 -> 35268 bytes images/people/saint.png | Bin 0 -> 36642 bytes images/people/sajolida.png | Bin 0 -> 7493 bytes images/people/serene.png | Bin 0 -> 33567 bytes images/people/sjmurdoch.png | Bin 0 -> 32427 bytes images/people/ssteele.png | Bin 0 -> 42072 bytes images/people/stephw.png | Bin 0 -> 35533 bytes images/people/syverson.png | Bin 0 -> 14050 bytes images/people/t0mmy.png | Bin 0 -> 25912 bytes images/people/tjr.png | Bin 0 -> 26593 bytes images/people/wseltzer.png | Bin 0 -> 38997 bytes images/pgp-key-large.png | Bin 0 -> 1621 bytes images/pgp-key.png | Bin 0 -> 1191 bytes ...shot_arm_page1.png => screenshot_nyx_page1.png} | Bin ...ropped.png => screenshot_nyx_page1_cropped.png} | Bin images/sources.txt | 10 + images/tor-onion-services-1.png | Bin 0 -> 17222 bytes images/tor-onion-services-2.png | Bin 0 -> 19207 bytes images/tor-onion-services-3.png | Bin 0 -> 22213 bytes images/tor-onion-services-4.png | Bin 0 -> 21419 bytes images/tor-onion-services-5.png | Bin 0 -> 22165 bytes images/tor-onion-services-6.png | Bin 0 -> 18018 bytes images/twitter-small.png | Bin 0 -> 3577 bytes images/twitter.png | Bin 0 -> 27482 bytes include/dlhead.wmi | 39 +- include/donatefoot.wmi | 4 +- include/donatehead.wmi | 11 +- include/foot.wmi | 2 +- include/head.wmi | 43 +- include/links.wmi | 3 +- include/mirrors-table.wmi | 614 ++-- include/thankyou-head.wmi | 149 - include/tor-mirrors.csv | 219 +- include/versions.wmi | 70 +- js/animate.js | 8 + js/animate.min.js | 1 + js/dlpage01.js | 19 +- js/donation_banner.js | 33 + js/functions.js | 65 + js/functions.min.js | 1 + js/jquery-migrate-1.0.0.js | 498 +++ js/jquery-migrate-1.0.0.min.js | 6 + js/jquery.ba-bbq.min.js | 6 +- keys/agrabeli.txt | 66 + keys/andreas.txt | 931 +++++ keys/antonela.txt | 52 + keys/biella.txt | 407 +++ keys/bparker.txt | 63 + keys/dawuud.txt | 471 +++ keys/donnchac.txt | 543 +++ keys/ewyatt.txt | 90 + keys/gunner.txt | 44 + keys/ian.txt | 746 ++++ keys/jselon.txt | 99 + keys/julius.txt | 681 ++++ keys/juris.txt | 321 ++ keys/moritz.txt | 3700 ++++++++++++++++++++ keys/ohmygodel.txt | 37 + keys/ramy.txt | 52 + keys/redshiftzero.txt | 191 + keys/robgjansen.txt | 1216 +++++++ keys/robt.txt | 47 + keys/sajolida.txt | 373 ++ keys/ssteele.txt | 363 ++ keys/stephw.txt | 247 ++ keys/t0mmy.txt | 51 + po2wml.sh | 38 +- press/en/press.wml | 96 + press/en/sidenav.wmi | 3 + projects/en/{arm.wml => nyx.wml} | 48 +- projects/en/projects.wml | 6 +- projects/en/sidenav.wmi | 4 +- projects/en/tbb-head.wmi | 33 +- projects/en/torbrowser.wml | 762 ++-- projects/en/tordnsel.wml | 6 +- projects/torbrowser/RecommendedTBBVersions | 28 +- rule-41/banner.html | 78 - rule-41/css/actions.css | 13 - rule-41/css/bootstrap-theme.min.css | 7 - rule-41/css/bootstrap.min.css | 14 - rule-41/css/call-email-tool.css | 1 - rule-41/email.html | 66 - rule-41/fonts/Rubik-Bold.woff | Bin 83368 -> 0 bytes rule-41/fonts/Rubik-Italic.woff | Bin 82032 -> 0 bytes rule-41/fonts/Rubik-Light.woff | Bin 87912 -> 0 bytes rule-41/fonts/montserrat-bold-webfont.woff | Bin 24372 -> 0 bytes rule-41/fonts/montserrat-bold-webfont.woff2 | Bin 18464 -> 0 bytes rule-41/fonts/montserrat-regular-webfont.woff | Bin 24560 -> 0 bytes rule-41/fonts/montserrat-regular-webfont.woff2 | Bin 18636 -> 0 bytes rule-41/fonts/sourcesanspro-bold-webfont.woff | Bin 33616 -> 0 bytes rule-41/fonts/sourcesanspro-bold-webfont.woff2 | Bin 26756 -> 0 bytes rule-41/imgs/close-button-mobile.png | Bin 820 -> 0 bytes rule-41/imgs/close-button.png | Bin 783 -> 0 bytes rule-41/imgs/fd-icon.png | Bin 7562 -> 0 bytes rule-41/imgs/mobile_txt.png | Bin 10485 -> 0 bytes rule-41/imgs/open-button.png | Bin 475 -> 0 bytes rule-41/imgs/spider.svg | 150 - rule-41/js/bootstrap.min.js | 7 - rule-41/js/css3-mediaqueries.js | 779 ----- rule-41/js/easyXDM.min.js | 24 - rule-41/js/html5.js | 8 - rule-41/js/international.js | 163 - rule-41/js/jquery-1.11.0.min.js | 4 - rule-41/js/jquery-1.11.0.min.map | 1 - rule-41/js/jquery.placeholder.min.js | 2 - rule-41/js/main.js | 10 - rule-41/js/modernizr.min.js | 1 - rule-41/js/respond.min.js | 1 - rule-41/js/social.js | 6 - rule-41/petition.html | 64 - rule-41/sass/call-email-tool.scss | 778 ---- rule-41/static/tdwfb-banner-static.png | Bin 5343 -> 0 bytes rule-41/styles.css | 373 -- rule-41/widget.js.orig | 381 -- rule-41/widget.min.js | 42 - rule-41/widget.min.js-orig | 42 - 276 files changed, 14748 insertions(+), 5334 deletions(-)

1 0