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

commit 682e105973f7ef3e74512d1eedb101ece4fdcf48 Merge: d4f2145 98f29cb Author: hiromipaw <hiro@torproject.org> Date: Sat Jul 1 09:57:11 2017 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml into staging Makefile | 4 ++-- include/versions.wmi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)