commit 5085745050fa26e1531412311c7b34c5fc287cba Merge: e8e32970 49d099e0 Author: hiromipaw hiro@torproject.org 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(-)