[tor-commits] [webwml/master] Merge branch 'master' into staging

commit a478b99ef1fc09162efd8f12be6c6e71de34d255 Merge: 56a20c47 616edbb9 Author: hiromipaw hiro@torproject.org Date: Thu Sep 7 15:57:00 2017 +0200

Merge branch 'master' into staging

Makefile | 2 +- about/en/jobs-browserdeveloper.wml | 1 - about/en/jobs-developerandroid.wml | 3 +- about/en/jobs-osdeveloperandroid.wml | 139 +++++++++++++++++++++++++++++ about/en/jobs.wml | 2 +- docs/torbutton/en/index.wml | 2 + include/versions.wmi | 22 ++--- press/en/press.wml | 24 +++++ projects/torbrowser/RecommendedTBBVersions | 4 + 9 files changed, 183 insertions(+), 16 deletions(-)