commit 662f92410fe5da301e81081f75f3fc3f9de099ab Merge: 670eef6f 1a0dc594 Author: hiro hiro@torproject.org Date: Mon Aug 27 13:15:08 2018 +0200

Merge branch 'master' into staging

download/en/tor.wml | 14 +++++++------- include/warning.wmi | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-)