commit 9036d6c788fb210733c0c68b5964bc1cd5b4a6aa Merge: a06cb1e 4612036 Author: hiro <hiro@torproject.org> Date: Wed Sep 26 15:45:30 2018 +0200 Merge branch 'noname' templates/intro.html | 70 +++++++++++++++++----------------------------------- 1 file changed, 23 insertions(+), 47 deletions(-)