commit 75fda3eccd77d5f6926cc29af88df57c76a7752b Merge: 253932f5 232e4645 Author: hiromipaw hiro@torproject.org Date: Tue Dec 26 11:14:19 2017 +0100

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

.htaccess | 3 ++- Makefile | 2 +- donate/en/donate-options.wml | 6 +++--- en/averyonionthankyou.wml | 11 +++++++++++ include/versions.wmi | 6 +++--- projects/torbrowser/RecommendedTBBVersions | 6 +++++- 6 files changed, 25 insertions(+), 9 deletions(-)