commit 761fecc50c13ec5e227a987ac4ebf2bb62ec35c5 Merge: 57ad436 9a01de7 Author: hiro hiro@torproject.org Date: Thu Jan 17 21:13:40 2019 +0100

Merge branch 'master' into staging

assets/scss/_portal.scss | 2 +- assets/static/bootstrap.css | 2 +- assets/static/images/sponsors/OTF.png | Bin 0 -> 18657 bytes assets/static/images/sponsors/USSD.png | Bin 499319 -> 90079 bytes assets/static/images/sponsors/cymru.png | Bin 18259 -> 16385 bytes assets/static/images/sponsors/darpa.png | Bin 525926 -> 127422 bytes assets/static/images/sponsors/fastly.png | Bin 0 -> 10142 bytes assets/static/images/sponsors/handshake.png | Bin 0 -> 11209 bytes assets/static/images/sponsors/imls.png | Bin 31458 -> 36164 bytes assets/static/images/sponsors/mdf.png | Bin 0 -> 29004 bytes assets/static/images/sponsors/mozilla.png | Bin 0 -> 16327 bytes assets/static/images/sponsors/nsf.png | Bin 1434049 -> 63745 bytes assets/static/images/sponsors/rose.png | Bin 37996 -> 42626 bytes assets/static/images/sponsors/sida.png | Bin 3355 -> 38963 bytes content/about/sponsors/fastly/contents.lr | 2 +- content/about/sponsors/handshake/contents.lr | 2 +- content/about/sponsors/mdf/contents.lr | 2 +- content/about/sponsors/mozilla/contents.lr | 2 +- content/about/sponsors/otf/contents.lr | 2 +- templates/layout.html | 2 +- templates/macros/sponsors.html | 6 +++-- templates/sponsors.html | 32 +++++++++++++-------------- 22 files changed, 28 insertions(+), 26 deletions(-)