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

[hiro at torproject.org]

commit 599051d2bc74011d44f78b7bc7399b90c949dde0
Merge: 4593792 630a318
Author: hiromipaw <hiro at torproject.org>
Date:   Mon Apr 10 11:43:59 2017 +0200

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

 Makefile             | 2 +-
 include/versions.wmi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)