commit 472321a51e20d0388e8f0ed48f5ac443684efe94 Merge: 0f20850a 0e11d089 Author: hiromipaw hiro@torproject.org Date: Wed Nov 22 18:22:50 2017 +0100

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(-)