commit 05ccf93e942a2d5ce59aa317055024d42ea1b737 Merge: bfe079ed ebd9653e Author: hiromipaw hiro@torproject.org Date: Fri Oct 27 19:44:48 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(-)