commit e723575a0af21667a143f85817af2c7f6164cd67 Merge: d4461c53 22ad2b69 Author: hiro hiro@torproject.org Date: Mon Nov 25 21:57:53 2019 +0100

Merge commit '22ad2b69d76ee1b581225100a80cc7e08399eb03' into staging

templates/about.html | 2 +- templates/homepage.html | 2 +- templates/layout.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)