[tor-commits] [webwml/master] Merge branch 'staging' of ssh://git-rw.torproject.org/project/web/webwml into staging

[hiro at torproject.org]

commit 17f293417c8143abefebcef91921287e0c787778
Merge: 512790e7 92819ff8
Author: hiromipaw <hiro at torproject.org>
Date:   Wed Nov 15 17:27:49 2017 +0100

    Merge branch 'staging' of ssh://git-rw.torproject.org/project/web/webwml into staging

 Makefile.common           |   2 +-
 download/download.html.es | 476 ++++++++++++++++++++++++++++++++++++++++++++++
 download/es/download.wml  | 376 ++++++++++++++++++++++++++++++++++++
 3 files changed, 853 insertions(+), 1 deletion(-)