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

[hiro at torproject.org]

commit d4f214518a1c5177d7045a7c78620a5c775fb09f
Merge: 14e3b1d d48f004
Author: hiromipaw <hiro at torproject.org>
Date:   Sat Jul 1 09:57:04 2017 +0200

    Merge branch 'master' into staging

 docs/debian-selector.js | 10 +++++-----
 docs/en/debian.wml      | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)