commit 01fb5c18cc0f8f03fcd89c8f77f4d71fc2422c35 Merge: 5c76a73 456701b Author: Pili Guerra pili@torproject.org Date: Thu May 30 13:53:53 2019 +0000

Merge branch 'onion-services' into 'staging'

Onion services

See merge request web/community!6

assets/static/images/home/png/onion-services.png | Bin 0 -> 164556 bytes .../images/onion-services/onion-sites/Tor.svg | 68 +++++++++++++ .../images/onion-services/onion-sites/nyt.png | Bin 0 -> 34530 bytes .../onion-services/onion-sites/propublica.svg | 1 + .../overview/tor-onion-services-1.png | Bin 0 -> 17222 bytes .../overview/tor-onion-services-2.png | Bin 0 -> 19207 bytes .../overview/tor-onion-services-3.png | Bin 0 -> 22213 bytes .../overview/tor-onion-services-4.png | Bin 0 -> 21419 bytes .../overview/tor-onion-services-5.png | Bin 0 -> 22165 bytes .../overview/tor-onion-services-6.png | Bin 0 -> 18018 bytes content/onion-services/onion-sites/nyt/contents.lr | 13 +++ .../onion-sites/propublica/contents.lr | 13 +++ .../onion-sites/tor-project/contents.lr | 15 +++ content/onion-services/overview/contents.lr | 112 +++++++++++++++++++++ content/onion-services/setup/contents.lr | 55 ++++++++++ content/onion-services/ssl-tls/contents.lr | 4 + models/onion-sites.ini | 22 ++++ templates/onion-services.html | 42 ++++++-- 18 files changed, 338 insertions(+), 7 deletions(-)