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

[hiro]

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@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[hiro]

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 mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[hiro]

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 -
 about/en/jobs-developerandroid.wml |   3 +-
 about/en/jobs-osdeveloperandroid.wml   | 139 +
 about/en/jobs.wml  |   2 +-
 docs/torbutton/en/index.wml|   2 +
 include/versions.wmi   |  22 ++---
 press/en/press.wml |  24 +
 projects/torbrowser/RecommendedTBBVersions |   4 +
 9 files changed, 183 insertions(+), 16 deletions(-)



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

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

[hiro]

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 insertions(+), 13 deletions(-)



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

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

[weasel]

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
  Add new Tor Browser alphas: 7.0a2
  Add new Tor Browser version: 6.5.1

 include/versions.wmi   |   48 +-
 projects/torbrowser/RecommendedTBBVersions |   20 +-
 projects/torbrowser/design/index.html.en   | 1113 +++-
 3 files changed, 778 insertions(+), 403 deletions(-)



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

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

[hiro]

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@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[hiro]

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 mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[hiro]

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 ++
 donate/en/sidenav.wmi   |  6 --
 2 files changed, 42 insertions(+), 6 deletions(-)



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

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

[hiro]

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 ++
 donate/en/donate-foot.wml |   0
 donate/en/donate-options.wml  |   2 +-
 download/en/download-easy.wml |  56 +--
 download/en/download-unix.wml |   2 +-
 download/en/download.wml  |  66 +-
 en/index.wml  |  32 +
 images/onion-heart.png| Bin 0 -> 10592 bytes
 images/tor-roots-only.png | Bin 0 -> 119059 bytes
 include/foot.wmi  |   2 +-
 include/navigation.wmi|   2 +-
 js/donation_banner.js |  36 ++
 projects/en/torbrowser.wml|   2 +-
 14 files changed, 239 insertions(+), 127 deletions(-)



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

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

[hiro]

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 mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[hiro]

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 mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[hiro]

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 +-
 about/en/jobs-coredev.wml   | 190 -
 about/en/jobs.wml   |   1 +
 donate/en/donate-amazon.wml |  42 
 donate/en/donate-appelbaum.wml  |   0
 donate/en/donate-banner.wml |   0
 donate/en/donate-blog-alison.wml|   0
 donate/en/donate-blog-benw.wml  |   0
 donate/en/donate-blog-cory.wml  |   0
 donate/en/donate-blog-ellsberg.wml  |   0
 donate/en/donate-blog-landau.wml|   0
 donate/en/donate-blog-molly.wml |   0
 donate/en/donate-blog-nanni.wml |   0
 donate/en/donate-blog-rabbirob.wml  |   0
 donate/en/donate-chaos.wml  |   0
 donate/en/donate-download.wml   |   0
 donate/en/donate-george-torwell.wml |   0
 donate/en/donate-hardware.wml   |  35 ---
 donate/en/donate-hp.wml |   0
 donate/en/donate-hpbanner.wml   |   0
 donate/en/donate-roger.wml  |   0
 donate/en/donate-service.wml|  45 
 donate/en/donate-snowden.wml|   0
 donate/en/donate-tbb.wml|   0
 donate/en/donate-twitter.wml|   0
 donate/en/donate.wml| 203 
 getinvolved/en/relays.wml   |   7 +-
 28 files changed, 104 insertions(+), 427 deletions(-)



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

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

[hiro]

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 insertions(+), 48 deletions(-)



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

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

[hiro]

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  |   4 +-
 about/en/board.wml| 126 +
 about/en/contact.wml  |   2 +-
 about/en/contributors.wml |  18 +-
 about/en/corepeople.wml   |  45 ++-
 about/en/jobs-ooni-ux-designer.wml| 105 +++
 about/en/jobs-ooni.wml| 151 --
 about/en/jobs.wml |  10 +-
 css/donate-style.css  |   2 +
 css/layout.css|  14 -
 docs/en/debian.wml|  19 +-
 docs/en/faq-abuse.wml |   2 +-
 docs/en/faq.wml   |  38 +--
 docs/en/hidden-services.wml   |   2 +-
 docs/en/pluggable-transports.wml  | 271 ++
 docs/en/rpms.wml  | 100 +--
 docs/en/signing-keys.wml  |  30 +-
 docs/en/tor-doc-osx.wml   |   4 +-
 docs/en/tor-doc-relay.wml |   3 +-
 docs/en/tor-doc-unix.wml  |   2 -
 docs/en/tor-manual.wml|   2 +-
 docs/en/verifying-signatures.wml  |  20 +-
 donate/en/donate-options.wml  |  79 ++
 donate/en/donor-faq.wml   |   2 +-
 download/en/download-easy.wml |  64 ++---
 download/en/download-unix.wml |   2 +-
 download/en/download.wml  |  35 +--
 eff/en/tor-legal-faq.wml  |   4 +-
 en/index.wml  |   2 +-
 getinvolved/en/tshirt.wml |  10 +-
 getinvolved/en/volunteer.wml  | 185 ++---
 images/2016-tor-logo-heart.png| Bin 0 -> 35104 bytes
 images/PT/2016-07-how-to-use-PT.png   | Bin 0 -> 494386 bytes
 images/tbb-macosx-step-1.png  | Bin 21334 -> 0 bytes
 images/tbb-macosx-step-2.png  | Bin 20451 -> 0 bytes
 images/tbb-macosx-step-3.png  | Bin 13846 -> 0 bytes
 include/donatehead.wmi|   2 +-
 include/head.wmi  |  15 +-
 include/mirrors-table.wmi | 202 ++
 include/tor-mirrors.csv   | 209 +++---
 include/versions.wmi  |  58 ++--
 projects/en/gettor.wml|   6 +
 projects/en/obfsproxy-debian-instructions.wml | 150 --
 projects/en/obfsproxy-instructions.wml| 164 ---
 projects/en/obfsproxy.wml | 102 ---
 projects/en/projects.wml  |  12 +-
 projects/en/sidenav.wmi   |  10 +-
 projects/en/torbrowser.wml|  17 +-
 projects/torbrowser/RecommendedTBBVersions|  20 +-
 rule-41/widget.js.orig| 381 ++
 rule-41/widget.min.js-orig|  42 +++
 52 files changed, 1328 insertions(+), 1450 deletions(-)

diff --cc css/donate-style.css
index 8dfbcc2,55cae54..671d097
--- a/css/donate-style.css
+++ b/css/donate-style.css
@@@ -229,100 -218,9 +229,102 @@@ blockquote::before 
  blockquote footer{
color: rgb(240,240,240);
  }
 +.donate-button {
 +  background-color: #4FAB76;
 +  border-color: #47996A;
 +}
 +.donate-button:hover,
 +.donate-button:focus,
 +.donate-button:active,
 +.donate-button:active:hover,
 +.donate-button:active:focus{
 +  background-color: #47996A;
 +  border-color: #47996A; 
 +}
 +#other-ways-section{
 +  display: none;
 +}
 +#other-ways-section > .container-fluid{
 +  padding: 0;
 +}
 +.hundred.toptwenty{
 +  text-align: justify;
 +  margin-top: 0;
 +}
 +.row-eqheight{
 +overflow: hidden; 
 +padding-bottom: 20px
 +}
 +.row-eqheight > [class*="col-"]{
 +margin-bottom: -9px;
 +padding-bottom: 9px;
 +}
 +.other-ways-title{
 +  margin: 10px 0;
 +}
 +.other-ways-title > h3{
 +  display: inline;
 +}
 +.other-ways-icon{
 +  background: transparent;
 +  margin-top: -10px;
 +  margin-right: 5px;
 +  border:0;
 +}
 +.bitcoin{
 +  padding-top: 10px;
 +  padding-left: 30px;
 +  padding-right: 30px;
 +}
 +#bitpayDonation > .well > .form-group {
 +margin-right: 0;
 +margin-left: 0;
 +}
 +#bitpayDonation > .well {
 +  box-shadow: none;
 +  border-radius: 7px;
 +  margin-bottom: 0;
 +}
 +.check-eutransfer{
 +  padding-top: 10px;
 +  padding-left: 30px;
 +  padding-right: 30px;
 +  border-left: 1px dashed #e3e3e3;
 +}
 +.minor-other-ways{
 +  background-color: 

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

[hiro]

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  |7 +
 Makefile   |2 +-
 about/en/contact.wml   |   10 +-
 about/en/corepeople.wml|   19 +-
 about/en/financials.wml|2 +
 about/en/gsoc.wml  |   14 +-
 ...orProject-combined-Form990_PC_Audit_Results.pdf |  Bin 0 -> 867206 bytes
 ...oject-combined-Form990_PC_Audit_Results.pdf.asc |   17 +
 css/layout.css |   35 +-
 docs/en/N900.wml   |  191 
 docs/en/debian.wml |   17 +-
 docs/en/faq.wml|   74 +-
 docs/en/rpms.wml   |2 +
 docs/en/sidenav.wmi|6 -
 docs/en/tor-doc-relay.wml  |   20 +-
 docs/en/tor-hidden-service.wml |   14 +-
 docs/en/verifying-signatures.wml   |   41 +-
 docs/torbutton/en/sidenav.wmi  |6 -
 donate/en/donate-appelbaum.wml |0
 donate/en/donate-blog-alison.wml   |0
 donate/en/donate-blog-ellsberg.wml |0
 donate/en/donate-blog-landau.wml   |0
 donate/en/donate-blog-nanni.wml|0
 donate/en/donate-chaos.wml |0
 donate/en/donate-snowden.wml   |0
 download/en/download-easy.wml  |   29 +-
 download/en/download-unix.wml  |2 +-
 download/en/download.wml   |   14 +-
 en/index.wml   |   33 -
 getinvolved/en/volunteer.wml   | 1204 +---
 images/N900/10_success-small.png   |  Bin 226409 -> 0 bytes
 images/N900/10_success.png |  Bin 174213 -> 0 bytes
 images/N900/11_after_rebooting-small.png   |  Bin 52131 -> 0 bytes
 images/N900/11_after_rebooting.png |  Bin 43976 -> 0 bytes
 images/N900/12_status_menu-small.png   |  Bin 122210 -> 0 bytes
 images/N900/12_status_menu.png |  Bin 99049 -> 0 bytes
 images/N900/13_enable_tor-small.png|  Bin 92249 -> 0 bytes
 images/N900/13_enable_tor.png  |  Bin 70965 -> 0 bytes
 images/N900/14_check_tor-small.png |  Bin 76880 -> 0 bytes
 images/N900/14_check_tor.png   |  Bin 49637 -> 0 bytes
 images/N900/1_app_menu-small.png   |  Bin 262268 -> 0 bytes
 images/N900/1_app_menu.png |  Bin 297204 -> 0 bytes
 images/N900/2_app_manager-small.png|  Bin 187985 -> 0 bytes
 images/N900/2_app_manager.png  |  Bin 242688 -> 0 bytes
 images/N900/3_app_managermenu-small.png|  Bin 144670 -> 0 bytes
 images/N900/3_app_managermenu.png  |  Bin 108576 -> 0 bytes
 images/N900/4_catalog_list-small.png   |  Bin 67683 -> 0 bytes
 images/N900/4_catalog_list.png |  Bin 55933 -> 0 bytes
 images/N900/5_new_catalog-small.png|  Bin 104907 -> 0 bytes
 images/N900/5_new_catalog.png  |  Bin 75177 -> 0 bytes
 images/N900/6_app_manager-small.png|  Bin 187392 -> 0 bytes
 images/N900/6_app_manager.png  |  Bin 241880 -> 0 bytes
 images/N900/7_app_categories-small.png |  Bin 137320 -> 0 bytes
 images/N900/7_app_categories.png   |  Bin 116193 -> 0 bytes
 images/N900/8_app_list-small.png   |  Bin 98294 -> 0 bytes
 images/N900/8_app_list.png |  Bin 72474 -> 0 bytes
 images/N900/9_disclaimer-small.png |  Bin 139479 -> 0 bytes
 images/N900/9_disclaimer.png   |  Bin 84438 -> 0 bytes
 images/homepage-banner-cd.jpg  |  Bin 84779 -> 0 bytes
 images/homepage-banner-lp.jpg  |  Bin 101171 -> 0 bytes
 images/homepage-banner-rd.jpg  |  Bin 86882 -> 0 bytes
 images/homepage-banner-rr.jpg  |  Bin 98192 -> 0 bytes
 images/homepage-banner-ss.jpg  |  Bin 92697 -> 0 bytes
 images/icon-TorMessenger.png   |  Bin 0 -> 2762 bytes
 include/foot.wmi   |1 -
 include/lang.wmi   |1 +
 include/mirrors-table.wmi  |  159 +--
 include/tor-mirrors.csv|  205 ++--
 include/versions.wmi 

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

[sebastian]

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@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[sebastian]

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 +
 getinvolved/en/tshirt.wml |   40 ++--
 images/torshirtsob.jpg|  Bin 0 - 34488 bytes
 4 files changed, 36 insertions(+), 14 deletions(-)



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

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

[sebastian]

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 +-
 about/en/sidenav.wmi |4 +-
 docs/en/rpms.wml |6 +-
 include/mirrors-table.wmi|  496 ++
 include/tor-mirrors.csv  |  154 ++--
 6 files changed, 272 insertions(+), 409 deletions(-)



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

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

[sebastian]

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 mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[sebastian]

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 mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[sebastian]

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 +
 include/tor-mirrors.csv   |  156 +++---
 2 files changed, 368 insertions(+), 300 deletions(-)

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

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

[sebastian]

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 mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[sebastian]

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(-)



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

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

[sebastian]

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|  272 +++-
 include/tor-mirrors.csv  |  142 +++---
 include/versions.wmi |2 +-
 projects/torbrowser/design/index.html.en |  701 +-
 5 files changed, 650 insertions(+), 469 deletions(-)



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

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

[sebastian]

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 changed, 2 insertions(+), 6 deletions(-)



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

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

[sebastian]

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 |  432 +-
 2 files changed, 245 insertions(+), 189 deletions(-)



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

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

[sebastian]

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   |   10 +++---
 projects/torbrowser/RecommendedTBBVersions |6 +++-
 projects/torbrowser/design/index.html.en   |   53 +---
 4 files changed, 52 insertions(+), 19 deletions(-)



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