[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit abe086532ce762fda147042f4cb5e4134e6f639c Merge: 96588533 492a32ee Author: hiro Date: Thu Sep 6 18:45:10 2018 +0200 Merge branch 'master' into staging download/en/download-easy.wml | 39 +++-- download/en/download.wml | 129 +-

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit fb08e8a0f261727b2a90fbb563e854b4f58bdb80 Merge: b9ee58ae b26ed3a3 Author: Nicolas Vigier Date: Thu Sep 6 01:43:54 2018 +0200 Merge branch 'master' into staging css/layout.css | 3 - css/layout.min.css | 2 +- include/lang.wmi

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit 662f92410fe5da301e81081f75f3fc3f9de099ab Merge: 670eef6f 1a0dc594 Author: hiro Date: Mon Aug 27 13:15:08 2018 +0200 Merge branch 'master' into staging download/en/tor.wml | 14 +++--- include/warning.wmi | 14 +++--- 2 files changed, 14 insertions(+), 14

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit 56d63982e4b40a6500033e2b579b0d0b50a27ab6 Merge: 0c0fb1fd a1a677f3 Author: Nicolas Vigier Date: Thu Nov 16 14:32:14 2017 +0100 Merge branch 'master' into staging ___ tor-commits mailing list

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit 12cd78c79b78ab182c90b93d629c83805ee65cfb Merge: a61cc30e a534ef42 Author: Nicolas Vigier Date: Thu Nov 16 12:23:57 2017 +0100 Merge branch 'master' into staging projects/torbrowser/RecommendedTBBVersions | 9 - 1 file changed, 9 deletions(-)

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit a478b99ef1fc09162efd8f12be6c6e71de34d255 Merge: 56a20c47 616edbb9 Author: hiromipaw Date: Thu Sep 7 15:57:00 2017 +0200 Merge branch 'master' into staging Makefile | 2 +- about/en/jobs-browserdeveloper.wml | 1 -

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit d4f214518a1c5177d7045a7c78620a5c775fb09f Merge: 14e3b1d d48f004 Author: hiromipaw Date: Sat Jul 1 09:57:04 2017 +0200 Merge branch 'master' into staging docs/debian-selector.js | 10 +- docs/en/debian.wml | 16 2 files changed, 13

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit 57e4d97282e562ac326a4bee0fd8843bcadc1741 Merge: da94bb4 371a8cf Author: Peter Palfrader Date: Sun Mar 19 18:05:49 2017 +0100 Merge branch 'master' into staging * master: Updating the Tor Browser design doc Deprecate old Tor Browser versions

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit b2db92757403366fc08800ede97bf5e67c3d992b Merge: bdccb68 f087130 Author: hiromipaw Date: Wed Jan 25 16:48:05 2017 +0100 Merge branch 'master' into staging ___ tor-commits mailing list

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit c8155f8ebc2252b874270634ed7ecdc99aa9f8d3 Merge: 667157a 5b7d63d Author: hiromipaw Date: Wed Jan 11 17:17:19 2017 +0100 Merge branch 'master' into staging about/en/corepeople.wml | 3 +++ 1 file changed, 3 insertions(+)

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit 8e9bb0994de8e448fa23d1866a05f4e1c88959f3 Merge: f537f67 8db53bc Author: Sebastian Hahn Date: Wed Nov 23 03:07:55 2016 +0100 Merge branch 'master' into staging donate/en/donate-amazon.wml | 42 ++

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit f537f67403f8aa8a50e31c24f4036b4fb7974bb0 Merge: b26b4d3 0efb835 Author: Sebastian Hahn Date: Wed Nov 23 02:45:20 2016 +0100 Merge branch 'master' into staging donate/en/donate-download.wml | 0 1 file changed, 0 insertions(+), 0 deletions(-)

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit b26b4d3fe3b88918f8c210e1d98872c928d5ee5a Merge: 45ac7bb 40a2526 Author: Sebastian Hahn Date: Wed Nov 23 02:34:54 2016 +0100 Merge branch 'master' into staging .htaccess | 6 +- about/en/contact.wml| 2 +-

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit 45ac7bbca1181e1a623b48adb82898b0173f4b32 Merge: 403a4f3 b045e32 Author: Sebastian Hahn Date: Wed Nov 23 01:30:51 2016 +0100 Merge branch 'master' into staging .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit 403a4f303e88c5d6f4a9827a2a8914c3cb4e800e Merge: 397b8d7 a469854 Author: Sebastian Hahn Date: Wed Nov 23 01:13:20 2016 +0100 Merge branch 'master' into staging .htaccess | 54 ++ 1 file changed, 6

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit d5eb3a4be8cbc762a38fdcd456959c8e4e54f3cb Merge: 497b708 42d36dc Author: Sebastian Hahn Date: Tue Nov 22 23:37:07 2016 +0100 Merge branch 'master' into staging .htaccess | 7 +- css/layout.css| 159

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit b817b1e8254219fbbe34f703e1340cfe31b2e686 Merge: 3d40243 d603837 Author: Sebastian Hahn Date: Fri Nov 18 14:04:09 2016 +0100 Merge branch 'master' into staging .htaccess | 35 +++ Makefile

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit 73bd703a38f9cd99f698df25306db9c46721ebc1 Merge: 06be3b3 9f831c0 Author: Roger Dingledine Date: Wed Mar 9 14:21:55 2016 -0500 Merge branch 'master' into staging .gitignore |1 - .htaccess

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit 1621e47c3ca92690ebd753bb0a8be923c83a92f2 Merge: 8c03c24 6572a52 Author: Sebastian Hahn sebast...@torproject.org Date: Fri Jul 24 03:11:00 2015 +0200 Merge branch 'master' into staging about/en/sponsors.wml |1 + en/index.wml |9 +

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit 8c03c2497a62d138abc2d7889c7e678147dfc72f Merge: f594383 6c54d65 Author: Sebastian Hahn sebast...@torproject.org Date: Mon Jul 20 18:00:47 2015 +0200 Merge branch 'master' into staging ___ tor-commits mailing list

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit 8a883c0f3cc928f02ab1c4af81be6ef2f7021c50 Merge: cbb4f2a d144128 Author: Sebastian Hahn sebast...@torproject.org Date: Sat Dec 20 16:17:25 2014 +0100 Merge branch 'master' into staging include/tor-mirrors.csv |2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit a41730e33ecc5424efae634c2d08956436dd00aa Merge: 34e59f0 c8815b6 Author: Sebastian Hahn sebast...@torproject.org Date: Sun Dec 14 00:39:08 2014 +0100 Merge branch 'master' into staging about/en/jobs-projectmanager.wml |4 +- about/en/jobs.wml| 17 +-

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit 60647e1d1a145a276eda6d79471ef7c25f294cf4 Merge: 27416df 74b49b8 Author: Sebastian Hahn sebast...@torproject.org Date: Tue Dec 9 18:58:47 2014 +0100 Merge branch 'master' into staging include/tor-mirrors.csv |2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit 1e3f52ef04fcb7eb15d0b76509fdc3f6dcec6377 Merge: fc2ccfb 4941ad1 Author: Sebastian Hahn sebast...@torproject.org Date: Wed Dec 3 03:16:45 2014 +0100 Merge branch 'master' into staging include/mirrors-table.wmi | 512 +

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit c8d45d4a02dfde72f5cbc119b05c51b4167dc407 Merge: 1f532ec d1f6a0c Author: Sebastian Hahn sebast...@torproject.org Date: Mon Nov 17 00:51:59 2014 +0100 Merge branch 'master' into staging images/icon-TorBirdy.jpg | Bin 3239 - 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-)

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit 393bc2fec7ecefa5e89c843a31308aecaa9ec00f Merge: f435fd9 08482db Author: Sebastian Hahn sebast...@torproject.org Date: Tue Nov 11 05:02:58 2014 +0100 Merge branch 'master' into staging about/en/corepeople.wml |4 getinvolved/en/volunteer.wml |4 ++-- 2 files

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit f435fd933c476a572594b8cc800a199e2edefb70 Merge: 44d698f bb9b5da Author: Sebastian Hahn sebast...@torproject.org Date: Mon Nov 10 02:08:58 2014 +0100 Merge branch 'master' into staging include/links.wmi|2 +- projects/torbrowser/design/index.html.en |

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit 44d698fda36e28d74beea5fa6d1afb42a9904a79 Merge: 885532f 6b1c990 Author: Sebastian Hahn sebast...@torproject.org Date: Mon Nov 3 00:53:55 2014 +0100 Merge branch 'master' into staging docs/en/verifying-signatures.wml |2 +- include/versions.wmi |

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit 885532f16dbd7cc453ed629ea4e7dfa5ec4f3d9b Merge: bc93fae afe5813 Author: Sebastian Hahn sebast...@torproject.org Date: Fri Oct 31 13:03:57 2014 +0100 Merge branch 'master' into staging Makefile |2 +- include/mirrors-table.wmi|

[tor-commits] [webwml/staging] Merge branch 'master' into staging

commit c4f7d23bd16e47db0c7b4fca7640556c6c50bb8d Merge: 7ea8c12 5f76c46 Author: Sebastian Hahn sebast...@torproject.org Date: Tue Oct 28 09:49:12 2014 +0100 Merge branch 'master' into staging en/index.wml |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)