commit f8e4e38dac98c1b0e42f76040fc6e7ac47b24713
Merge: 39a9a23b efffbdc9
Author: traumschule <traumschulerie...@riseup.net>
Date: Wed Aug 22 21:11:06 2018 +0200
merge upstream/master
.well-known/security.txt | 12 +
about/en/contact.wml | 17 +-
about/en/corepeople.wml | 145 +-
about/en/jobs.wml | 4 +-
about/en/overview.wml | 16 +-
docs/debian-selector.js | 4 +-
docs/en/debian.wml | 97 +-
docs/en/documentation.wml | 17 +-
docs/en/faq-abuse.wml | 46 +-
docs/en/faq.wml | 3951 ++++++++++++++--------------
docs/en/tor-onion-service.wml | 145 +-
docs/en/verifying-signatures.wml | 69 +-
download/en/download-unix.wml | 2 +-
getinvolved/en/volunteer.wml | 13 +-
images/people/emmapeel.png | Bin 0 -> 26223 bytes
images/people/orig/emmapeel.png | Bin 0 -> 150954 bytes
include/foot.wmi | 12 +-
include/versions.wmi | 4 +-
projects/en/gettor.wml | 3 +-
projects/en/torbrowser.wml | 90 +
projects/torbrowser/RecommendedTBBVersions | 14 +-
21 files changed, 2457 insertions(+), 2204 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
