commit 57e4d97282e562ac326a4bee0fd8843bcadc1741 Merge: da94bb4 371a8cf Author: Peter Palfrader peter@palfrader.org Date: Sun Mar 19 18:05:49 2017 +0100

Merge branch 'master' into staging

* master: Updating the Tor Browser design doc Deprecate old Tor Browser versions Add new Tor Browser alphas: 7.0a2 Add new Tor Browser version: 6.5.1

include/versions.wmi | 48 +- projects/torbrowser/RecommendedTBBVersions | 20 +- projects/torbrowser/design/index.html.en | 1113 +++++++++++++++++++--------- 3 files changed, 778 insertions(+), 403 deletions(-)