[tor-commits] [webwml/master] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml into 24720+1

[hiro]

commit 79d2298593e9fe95211972a271cc671ad910162e
Merge: 048de3fe 232e4645
Author: hiromipaw <h...@torproject.org>
Date:   Tue Dec 26 11:19:36 2017 +0100

    Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml 
into 24720+1




_______
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' of ssh://git-rw.torproject.org/project/web/webwml into 24673

[hiro]

commit 75fda3eccd77d5f6926cc29af88df57c76a7752b
Merge: 253932f5 232e4645
Author: hiromipaw 
Date:   Tue Dec 26 11:14:19 2017 +0100

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml 
into 24673

 .htaccess  |  3 ++-
 Makefile   |  2 +-
 donate/en/donate-options.wml   |  6 +++---
 en/averyonionthankyou.wml  | 11 +++
 include/versions.wmi   |  6 +++---
 projects/torbrowser/RecommendedTBBVersions |  6 +-
 6 files changed, 25 insertions(+), 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' of ssh://git-rw.torproject.org/project/web/webwml

[hiro]

commit 753c7af4b1d892c8b6397a47daac4e4968298dc0
Merge: 4771d7fe 86a86d75
Author: hiromipaw 
Date:   Wed Dec 20 11:47:04 2017 +0100

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 include/versions.wmi   | 4 ++--
 projects/torbrowser/RecommendedTBBVersions | 6 +-
 2 files changed, 7 insertions(+), 3 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' of ssh://git-rw.torproject.org/project/web/webwml into faq-section-anchors

[hiro]

commit 8e385ca3d5e8809a91fb4f225d7375c7180480d6
Merge: f98b7fd5 34c7baf2
Author: hiromipaw 
Date:   Thu Dec 14 19:59:13 2017 +0100

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml 
into faq-section-anchors

 .gitignore |   4 +-
 Makefile.common|   2 +-
 about/en/corepeople.wml| 159 +++---
 css/layout-rtl.css |   2 +-
 css/layout.css |  52 -
 css/layout.min.css |   2 +-
 css/master.css |   1 +
 docs/en/faq.wml|  22 +-
 download/es/download-easy.wml  | 286 
 download/es/download-unix.wml  | 168 ++
 download/es/download.wml   | 341 +
 images/people/amoghbl1.png | Bin 0 -> 11879 bytes
 include/dlhead.wmi |  40 +++-
 include/foot.wmi   |  52 +
 include/lang.wmi   |   2 +-
 include/navigation.wmi |   1 +
 include/versions.wmi   |  13 +-
 projects/torbrowser/RecommendedTBBVersions |  16 +-
 18 files changed, 1001 insertions(+), 162 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' of ssh://git-rw.torproject.org/project/web/webwml into faq-hrefs-for-anchors

[hiro]

commit 99f445f943b9abec3677b5af9931c629657a55a8
Merge: f87eea1a 53990269
Author: hiromipaw 
Date:   Wed Dec 13 16:16:38 2017 +0100

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml 
into faq-hrefs-for-anchors

 .gitignore |   4 +-
 Makefile.common|   2 +-
 about/en/corepeople.wml| 157 ++---
 css/layout-rtl.css |   2 +-
 css/layout.css |  52 -
 css/layout.min.css |   2 +-
 css/master.css |   1 +
 download/es/download-easy.wml  | 286 
 download/es/download-unix.wml  | 168 ++
 download/es/download.wml   | 341 +
 images/people/amoghbl1.png | Bin 0 -> 11879 bytes
 include/dlhead.wmi |  40 +++-
 include/foot.wmi   |  52 +
 include/lang.wmi   |   2 +-
 include/navigation.wmi |   1 +
 include/versions.wmi   |  13 +-
 projects/torbrowser/RecommendedTBBVersions |  16 +-
 17 files changed, 989 insertions(+), 150 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' of ssh://git-rw.torproject.org/project/web/webwml

[hiro]

commit c69eb984b93efb9779dd867787098b67f663852e
Merge: 1731e62d 3f17add4
Author: hiromipaw 
Date:   Mon Nov 27 20:41:21 2017 +0100

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 about/en/contributors.wml   |   3 -
 about/en/corepeople.wml | 152 
 css/people-table.css|  40 
 images/people/orig/redshiftzero.jpg | Bin 0 -> 51523 bytes
 images/people/redshiftzero.png  | Bin 0 -> 45395 bytes
 keys/redshiftzero.txt   | 191 
 6 files changed, 292 insertions(+), 94 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' of ssh://git-rw.torproject.org/project/web/webwml

[hiro]

commit 472321a51e20d0388e8f0ed48f5ac443684efe94
Merge: 0f20850a 0e11d089
Author: hiromipaw 
Date:   Wed Nov 22 18:22:50 2017 +0100

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 Makefile | 2 +-
 include/versions.wmi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

[tor-commits] [webwml/master] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

[hiro]

commit 05ccf93e942a2d5ce59aa317055024d42ea1b737
Merge: bfe079ed ebd9653e
Author: hiromipaw 
Date:   Fri Oct 27 19:44:48 2017 +0200

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 Makefile | 2 +-
 include/versions.wmi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

[tor-commits] [webwml/master] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

[hiro]

commit 41fdb8a7b32967655408b3858f2238436c5c7481
Merge: c73adcb5 3d72cf7f
Author: hiromipaw 
Date:   Thu Oct 19 13:45:47 2017 +0200

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 about/en/corepeople.wml |  47 ++-
 about/en/sponsors.wml   |   4 ++--
 images/people/ramy.png  | Bin 0 -> 36799 bytes
 keys/ramy.txt   |  52 
 4 files changed, 83 insertions(+), 20 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' of ssh://git-rw.torproject.org/project/web/webwml

[hiro]

commit 616edbb9b49fe160dd517fde066b472390548536
Merge: 1b806313 88b17d9e
Author: hiromipaw 
Date:   Thu Sep 7 15:56:40 2017 +0200

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 Makefile   |  2 +-
 include/versions.wmi   | 22 +++---
 projects/torbrowser/RecommendedTBBVersions |  4 
 3 files changed, 16 insertions(+), 12 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' of ssh://git-rw.torproject.org/project/web/webwml into staging

[hiro]

commit 7bf7ad9ebe1628193b1c5f9e3f2a455fd6fd282e
Merge: 646ccefe 52c29243
Author: hiromipaw 
Date:   Mon Aug 14 14:39:21 2017 +0200

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml 
into staging

 about/en/corepeople.wml|  2 +-
 about/en/sponsors.wml  | 16 +--
 include/versions.wmi   | 44 +++---
 projects/torbrowser/RecommendedTBBVersions | 18 ++--
 4 files changed, 39 insertions(+), 41 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' of ssh://git-rw.torproject.org/project/web/webwml

[hiro]

commit 7e3fccb40a7c619f44845b5495bfab411141b777
Merge: e670475b 52c29243
Author: hiromipaw 
Date:   Thu Aug 24 16:21:48 2017 +0200

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 about/en/corepeople.wml|  2 +-
 about/en/sponsors.wml  | 16 +--
 include/versions.wmi   | 44 +++---
 projects/torbrowser/RecommendedTBBVersions | 18 ++--
 4 files changed, 39 insertions(+), 41 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' of ssh://git-rw.torproject.org/project/web/webwml

[hiro]

commit 1cfaef279fc3242e1396e7924ac7388d7ca302f7
Merge: a085cc07 1a9bc4f0
Author: hiromipaw 
Date:   Mon Aug 7 18:49:00 2017 +0200

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 Makefile   |   4 +-
 about/en/corepeople.wml|  89 
 include/versions.wmi   |   4 +-
 keys/juris.txt | 321 +
 projects/torbrowser/RecommendedTBBVersions |   1 -
 5 files changed, 374 insertions(+), 45 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' of ssh://git-rw.torproject.org/project/web/webwml

[hiro]

commit 2131b93aa996ca3bfed42f47f93cbd84473fbf70
Merge: f5b2e3f f673f59
Author: hiromipaw 
Date:   Fri Jul 14 16:19:29 2017 +0200

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 about/en/contributors.wml |6 +
 about/en/corepeople.wml   |6 -
 about/en/corepeople_alternate.wml |  207 +-
 images/people/agrabeli.png|  Bin 0 -> 29509 bytes
 images/people/arma.png|  Bin 0 -> 34872 bytes
 images/people/bparker.png |  Bin 0 -> 21887 bytes
 images/people/dawuud.png  |  Bin 0 -> 22257 bytes
 images/people/isabela.png |  Bin 0 -> 14705 bytes
 images/people/ln5.png |  Bin 0 -> 34926 bytes
 images/people/n8fr8.png   |  Bin 0 -> 32079 bytes
 images/people/nickm.png   |  Bin 0 -> 41516 bytes
 images/people/orig/agrabeli.jpg   |  Bin 0 -> 19745 bytes
 images/people/orig/arma.jpg   |  Bin 0 -> 74271 bytes
 images/people/orig/dawuud.jpg |  Bin 0 -> 9640 bytes
 images/people/orig/isabela.jpg|  Bin 0 -> 16817 bytes
 images/people/orig/kat5.jpg   |  Bin 1013588 -> 0 bytes
 images/people/orig/ln5.jpg|  Bin 0 -> 18819 bytes
 images/people/orig/n8fr8.jpg  |  Bin 0 -> 21843 bytes
 images/people/orig/pepijn.jpg |  Bin 0 -> 1025994 bytes
 images/people/orig/robt.png   |  Bin 0 -> 689358 bytes
 images/people/orig/serene.jpg |  Bin 0 -> 42790 bytes
 images/people/orig/syverson.jpg   |  Bin 0 -> 729689 bytes
 images/people/pepijn.png  |  Bin 0 -> 31866 bytes
 images/people/robt.png|  Bin 0 -> 35268 bytes
 images/people/roya.png|  Bin 0 -> 36754 bytes
 images/people/serene.png  |  Bin 0 -> 33567 bytes
 images/people/syverson.png|  Bin 0 -> 14050 bytes
 keys/agrabeli.txt |   66 +
 keys/ahf.txt  |  172 -
 keys/ailanthus.txt|  168 -
 keys/arlolra.txt  | 1534 
 keys/arthuredelstein.txt  |   27 -
 keys/asn.txt  |  175 -
 keys/atagar.txt   |   56 -
 keys/bparker.txt  |   63 +
 keys/dgoulet.txt  | 2437 
 keys/flexlibris.txt   |  771 
 keys/geko.txt |  833 
 keys/hellais.txt  |   99 -
 keys/hiro.txt | 1903 --
 keys/karsten.txt  | 1074 --
 keys/linda.txt|  315 --
 keys/mcs.txt  |   29 -
 keys/mrphs.txt|  352 --
 keys/nickm.txt|  606 ---
 keys/pastly.txt   |   97 -
 keys/phoul.txt|  915 -
 keys/qbi.txt  | 7515 -
 keys/robt.txt |   47 +
 keys/saint.txt|  766 
 keys/sukhe.txt|  371 --
 keys/teor.txt | 1156 --
 keys/tjr.txt  |  507 ---
 keys/wseltzer.txt |  590 ---
 54 files changed, 353 insertions(+), 22510 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' of ssh://git-rw.torproject.org/project/web/webwml

[hiro]

commit ad8e63b801003d4504b24a852c168ee98abcb815
Merge: 3f2a2cc bdf9077
Author: hiromipaw 
Date:   Mon Jul 10 19:31:27 2017 +0200

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 about/en/corepeople_alternate.wml |   43 +-
 images/people/hiro.png|  Bin 0 -> 14842 bytes
 images/people/orig/hiro.jpg   |  Bin 0 -> 12804 bytes
 keys/asn.txt  |  175 
 keys/hiro.txt | 1903 +
 5 files changed, 2109 insertions(+), 12 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' of ssh://git-rw.torproject.org/project/web/webwml

[hiro]

commit 5085745050fa26e1531412311c7b34c5fc287cba
Merge: e8e3297 49d099e
Author: hiromipaw 
Date:   Mon Jul 10 10:30:30 2017 +0200

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 about/en/corepeople_alternate.wml  |  317 ++
 images/people/arthuredelstein.png  |  Bin 0 -> 37957 bytes
 images/people/atagar.png   |  Bin 0 -> 38415 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/ian.png  |  Bin 0 -> 40460 bytes
 images/people/karsten.png  |  Bin 0 -> 37330 bytes
 images/people/kat5.png |  Bin 0 -> 53700 bytes
 images/people/no_photo.png |  Bin 0 -> 10668 bytes
 images/people/ohmygodel.png|  Bin 0 -> 32230 bytes
 images/people/orig/arthuredelstein.jpg |  Bin 0 -> 18449 bytes
 images/people/orig/atagar.png  |  Bin 0 -> 116545 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/ian.jpg |  Bin 0 -> 30787 bytes
 images/people/orig/karsten.jpg |  Bin 0 -> 90829 bytes
 images/people/orig/kat5.jpg|  Bin 0 -> 1013588 bytes
 images/people/orig/ohmygodel.jpg   |  Bin 0 -> 25960 bytes
 images/people/orig/phoul.jpg   |  Bin 0 -> 14218 bytes
 images/people/orig/robgjansen.jpg  |  Bin 0 -> 24939 bytes
 images/people/orig/t0mmy.jpg   |  Bin 0 -> 50507 bytes
 images/people/orig/tjr.jpg |  Bin 0 -> 91681 bytes
 images/people/pastly.png   |  Bin 0 -> 31851 bytes
 images/people/phoul.png|  Bin 0 -> 5932 bytes
 images/people/robgjansen.png   |  Bin 0 -> 33856 bytes
 images/people/t0mmy.png|  Bin 0 -> 25912 bytes
 images/people/tjr.png  |  Bin 0 -> 26593 bytes
 images/pgp-key-large.png   |  Bin 0 -> 1621 bytes
 images/pgp-key.png |  Bin 0 -> 1191 bytes
 images/sources.txt |   10 +
 images/twitter-small.png   |  Bin 0 -> 3577 bytes
 images/twitter.png |  Bin 0 -> 27482 bytes
 include/versions.wmi   |   50 +-
 keys/ahf.txt   |  172 +
 keys/arthuredelstein.txt   |   27 +
 keys/atagar.txt|   56 +
 keys/dawuud.txt|  471 ++
 keys/dgoulet.txt   | 2437 +
 keys/flexlibris.txt|  771 +++
 keys/geko.txt  |  833 +++
 keys/gunner.txt|   44 +
 keys/hellais.txt   |   99 +
 keys/ian.txt   |  746 +++
 keys/julius.txt|  681 +++
 keys/karsten.txt   | 1074 
 keys/mrphs.txt |  352 ++
 keys/ohmygodel.txt |   37 +
 keys/pastly.txt|   97 +
 keys/phoul.txt |  915 
 keys/qbi.txt   | 7515 
 keys/robgjansen.txt| 1216 +
 keys/t0mmy.txt |   51 +
 keys/teor.txt  | 1156 +
 keys/tjr.txt   |  507 ++
 projects/torbrowser/RecommendedTBBVersions |   14 +-
 57 files changed, 19618 insertions(+), 30 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' of ssh://git-rw.torproject.org/project/web/webwml

[hiro]

commit 38c1f31e18931e524fb4ca20d64dc39b4681967d
Merge: 9ecbc33 aff2249
Author: hiromipaw 
Date:   Mon Jul 3 09:40:00 2017 +0200

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 docs/debian-selector.js | 20 ++--
 1 file changed, 10 insertions(+), 10 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' of ssh://git-rw.torproject.org/project/web/webwml into staging

[hiro]

commit 682e105973f7ef3e74512d1eedb101ece4fdcf48
Merge: d4f2145 98f29cb
Author: hiromipaw 
Date:   Sat Jul 1 09:57:11 2017 +0200

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml 
into staging

 Makefile | 4 ++--
 include/versions.wmi | 4 ++--
 2 files changed, 4 insertions(+), 4 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' of ssh://git-rw.torproject.org/project/web/webwml into staging

[hiro]

commit 477c6d8cd697922446ca9ed7fc2c2894e930c608
Merge: e4c7725 25ec054
Author: hiromipaw 
Date:   Fri Jun 16 20:38:20 2017 +0200

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml 
into staging

 projects/torbrowser/RecommendedTBBVersions | 12 
 1 file changed, 12 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' of ssh://git-rw.torproject.org/project/web/webwml

[hiro]

commit 599051d2bc74011d44f78b7bc7399b90c949dde0
Merge: 4593792 630a318
Author: hiromipaw 
Date:   Mon Apr 10 11:43:59 2017 +0200

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 Makefile | 2 +-
 include/versions.wmi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

[tor-commits] [webwml/master] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

[hiro]

commit 45863aab95581b938ef7d55fa1e8cc41892a33a6
Merge: b718b34 7ae390e
Author: hiromipaw 
Date:   Thu Jan 26 15:32:42 2017 +0100

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 projects/torbrowser/RecommendedTBBVersions | 10 --
 1 file changed, 10 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' of ssh://git-rw.torproject.org/project/web/webwml

[hiro]

commit e27390e76ca3ffdb6981067fe7ed4ac5f0854943
Merge: 1f0363b fd8c847
Author: hiromipaw 
Date:   Wed Jan 25 17:17:44 2017 +0100

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 Makefile   |  4 +-
 include/lang.wmi   |  2 +-
 include/versions.wmi   | 60 +++---
 projects/en/torbrowser.wml | 22 +--
 projects/torbrowser/RecommendedTBBVersions | 12 +-
 5 files changed, 54 insertions(+), 46 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' of ssh://git-rw.torproject.org/project/web/webwml

[arma]

commit fd56b785c6300a0b675bcd30424c6a3c67472b9f
Merge: fea31a2 5628d54
Author: Roger Dingledine a...@torproject.org
Date:   Mon May 4 22:35:33 2015 -0400

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

Conflicts:
press/en/info.wmi

 Makefile   |4 +-
 about/en/board.wml |  120 +++---
 about/en/contact.wml   |   20 +-
 about/en/corepeople.wml|   28 +-
 about/en/gsoc.wml  |6 +-
 about/en/overview.wml  |   51 +--
 about/en/sponsors.wml  |7 +-
 about/en/torusers.wml  |   76 ++--
 about/en/volunteers.wml|   18 +-
 css/layout.css |   15 +-
 docs/en/bridges.wml|   10 +-
 docs/en/debian.wml |  240 +++-
 docs/en/faq.wml|   22 +-
 docs/en/hidden-services.wml|   40 +-
 docs/en/pluggable-transports.wml   |2 +-
 docs/en/running-a-mirror.wml   |4 +-
 docs/en/signing-keys.wml   |   11 +-
 docs/en/tor-doc-osx.wml|  131 +++
 docs/en/tor-doc-relay.wml  |6 +-
 docs/en/tor-doc-unix.wml   |   22 +-
 docs/en/tor-doc-windows.wml|   51 +--
 docs/en/tor-hidden-service.wml |   18 +-
 docs/en/verifying-signatures.wml   |  132 ---
 docs/torbutton/en/design/design.xml|4 +-
 docs/torbutton/en/design/index.html.en |4 +-
 donate/en/donate.wml   |   12 +-
 download/en/download-easy.wml  |   30 +-
 download/en/download.wml   |   10 +-
 getinvolved/en/relays.wml  |   34 +-
 getinvolved/en/tshirt.wml  |4 +-
 getinvolved/en/volunteer.wml   |  208 --
 images/tbb-macosx-step-1.png   |  Bin 0 - 21334 bytes
 images/tbb-macosx-step-2.png   |  Bin 0 - 20451 bytes
 images/tbb-macosx-step-3.png   |  Bin 0 - 13846 bytes
 include/dlhead.wmi |4 +-
 include/mirrors-table.wmi  |  302 +++
 include/tor-mirrors.csv|  150 
 include/versions.wmi   |   30 +-
 press/en/info.wmi  |5 +
 press/en/press.wml |   60 +++
 projects/en/gettor.wml |   93 +
 projects/en/obfsproxy.wml  |2 +-
 projects/en/torbrowser.wml |   78 ++--
 projects/torbrowser/RecommendedTBBVersions |   20 +-
 projects/torbrowser/design/index.html.en   |  562 +---
 45 files changed, 1419 insertions(+), 1227 deletions(-)

diff --cc press/en/info.wmi
index 5429016,9c9e307..52968ff
--- a/press/en/info.wmi
+++ b/press/en/info.wmi
@@@ -7,7 -7,8 +7,12 @@@
  h2 class=mediaPress Contact/h2
  p
  bTor Press Team/bbr
++ HEAD
 +exec...@torproject.orgbr
++===
+ pr...@torproject.orgbr
+ +1-617-902-0208
++ 5628d54898b63540d5df3179261a9cdd591fd970
  /p
  /div
 !-- END INFOBLOCK --



___
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' of ssh://git-rw.torproject.org/project/web/webwml

[andrew]

commit baa57e39a0bb020d7db1bd7b9bb43d0510c620cb
Merge: 91d79dd 4ac2940
Author: Andrew Lewman and...@torproject.is
Date:   Tue Mar 17 13:17:18 2015 -0400

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 Makefile |2 +-
 include/versions.wmi |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

[tor-commits] [webwml/master] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

[andrew]

commit fc6478c74d0f541797c4d592c4e5095799e2ce92
Merge: 684578d a1ae777
Author: Andrew Lewman and...@torproject.is
Date:   Tue Jan 6 11:47:35 2015 -0500

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 about/en/gsoc.wml |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' of ssh://git-rw.torproject.org/project/web/webwml

[andrew]

commit b39fa85f3865c5672d32857aa1b4d20d6de334aa
Merge: d32bc78 cdb2483
Author: Andrew Lewman and...@torproject.is
Date:   Mon Nov 24 11:52:19 2014 -0500

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 projects/en/sampleproject.wml |   25 -
 1 file changed, 25 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' of ssh://git-rw.torproject.org/project/web/webwml

[andrew]

commit abb69c55fb4b43ca9612ac833b2d01f7f0d5c794
Merge: c106733 02a1457
Author: Andrew Lewman and...@torproject.is
Date:   Wed Nov 19 10:00:51 2014 -0500

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 include/versions.wmi   |2 +-
 projects/en/torbrowser.wml |   62 ++--
 2 files changed, 32 insertions(+), 32 deletions(-)

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