Merge branch 'master' into i18n

_includes/sections/browser-addons.html

@@ -106,7 +106,7 @@ image="/assets/img/addons/snowflake.png"
 description=descr7
 website="https://snowflake.torproject.org"
 forum="https://forum.privacytools.io/t/discussion-snowflake/1146"
-github="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
+git="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
 firefox=""
 chrome=""
 %}