[tor-commits] [tpo/staging] Merge branch 'master' into staging

[hiro@xxxxxxxxxxxxxx]

commit 57ad436b36cf842dadcf0850843ad9b9e3825ac2
Merge: 530331a 9c31480
Author: hiro <hiro@xxxxxxxxxxxxxx>
Date:   Thu Jan 17 19:32:12 2019 +0100

    Merge branch 'master' into staging

 assets/scss/_portal.scss        |    6 +-
 assets/scss/_tor.scss           |    9 +-
 assets/scss/_tpo.scss           |    6 +-
 assets/static/bootstrap.css     | 8632 ++++++++++++++++++++++++---------------
 assets/static/bootstrap.css.map |    8 +-
 templates/contact.html          |    6 +-
 templates/download.html         |    8 +-
 templates/footer.html           |    4 +-
 templates/hero-download.html    |    3 +-
 templates/press.html            |    8 +-
 templates/projects.html         |    2 +-
 11 files changed, 5382 insertions(+), 3310 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits