[tor-commits] [webwml/staging] Merge master

[hiro@xxxxxxxxxxxxxx]

commit e4d0feaa4e5675c60394594decb8afb6cdecff4c
Merge: 0ef0389e 656a7a38
Author: hiromipaw <hiro@xxxxxxxxxxxxxx>
Date:   Tue Dec 5 18:10:06 2017 +0100

    Merge master

 Makefile                            |   4 +-
 about/en/board.wml                  |   6 +-
 about/en/contact.wml                |  42 ++++--
 about/en/contributors.wml           |  11 +-
 about/en/corepeople.wml             | 127 +++++++-----------
 about/en/gsoc.wml                   |   2 +-
 about/en/overview.wml               |   2 +-
 about/en/torusers.wml               |  47 +++----
 css/people-table.css                |  40 ++++++
 docs/en/faq-abuse.wml               |  10 +-
 docs/en/faq.wml                     |  56 ++++----
 docs/en/hidden-services.wml         | 162 +---------------------
 docs/en/onion-services.wml          | 162 ++++++++++++++++++++++
 docs/en/sidenav.wmi                 |   4 +-
 docs/en/tor-doc-osx.wml             |   2 +-
 docs/en/tor-hidden-service.wml      | 258 +-----------------------------------
 docs/en/tor-onion-service.wml       | 258 ++++++++++++++++++++++++++++++++++++
 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 +-
 getinvolved/en/volunteer.wml        |  40 +++---
 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/people/orig/redshiftzero.jpg | Bin 0 -> 51523 bytes
 images/people/redshiftzero.png      | Bin 0 -> 45395 bytes
 images/people/roya.png              | Bin 36754 -> 0 bytes
 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
 include/donatehead.wmi              |   4 +-
 include/foot.wmi                    |   2 +-
 include/links.wmi                   |   2 +-
 include/versions.wmi                |   4 +-
 keys/redshiftzero.txt               | 191 ++++++++++++++++++++++++++
 press/en/press.wml                  |  30 +++++
 projects/en/tordnsel.wml            |   6 +-
 46 files changed, 900 insertions(+), 618 deletions(-)




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