[tor-commits] [tpo/master] rebase

2019-02-11 Thread hiro
commit 51578a5c2fc2d909c0132b3bf412521e626dc18f
Merge: ab06e0d 18258ec
Author: Antonela 
Date:   Mon Feb 11 17:27:09 2019 +0100

rebase

 content/about/people/andreas/contents.lr |  3 +--
 content/about/people/juga/contents.lr|  8 +++-
 content/about/people/julius-core/contents.lr |  8 +---
 content/download/languages/contents.lr   |  1 +
 content/download/options/contents.lr |  3 +++
 content/thank-you/contents.lr|  2 +-
 templates/download-languages.html|  2 +-
 templates/download-options.html  |  2 +-
 templates/download.html  |  4 ++--
 templates/footer.html| 15 +--
 templates/hero-download.html |  2 +-
 templates/home.html  |  4 ++--
 templates/homepage.html  |  8 +---
 templates/macros/downloads.html  |  6 +++---
 templates/script-download.html   | 14 ++
 templates/sponsors.html  |  2 +-
 templates/thank-you.html |  2 +-
 17 files changed, 46 insertions(+), 40 deletions(-)



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


[tor-commits] [tpo/master] rebase

2019-01-17 Thread hiro
commit c34d50ad7d96a7dd3c13adb5b47f6d8a077a785a
Author: Antonela 
Date:   Thu Jan 17 13:58:48 2019 -0300

rebase
---
 .gitignore |   3 +-
 assets/static/images/sponsors/OTF.jpg  | Bin 0 -> 22698 bytes
 assets/static/images/sponsors/USSD.png | Bin 0 -> 499319 bytes
 assets/static/images/sponsors/artwork.png  | Bin 0 -> 22387 bytes
 assets/static/images/sponsors/artw...@2x.png   | Bin 0 -> 46793 bytes
 assets/static/images/sponsors/cymru.png| Bin 0 -> 18259 bytes
 assets/static/images/sponsors/darpa.png| Bin 0 -> 525926 bytes
 assets/static/images/sponsors/fastly.svg   |   1 +
 assets/static/images/sponsors/handshake.svg|  13 
 assets/static/images/sponsors/imls.png | Bin 0 -> 31458 bytes
 assets/static/images/sponsors/mdf.jpg  | Bin 0 -> 11032 bytes
 assets/static/images/sponsors/mozilla.jpg  | Bin 0 -> 15093 bytes
 assets/static/images/sponsors/nsf.png  | Bin 0 -> 1434049 bytes
 assets/static/images/sponsors/rose.png | Bin 0 -> 37996 bytes
 assets/static/images/sponsors/sida.png | Bin 0 -> 3355 bytes
 configs/i18n.ini   |   3 +-
 content/about/history/contents.lr  |  25 ---
 content/about/jobs/contents.lr |   2 +
 .../jobs/developer-data-architect/contents.lr  |  79 +
 .../jobs/senior-system-administrator/contents.lr   |  59 +++
 content/about/people/agrabeli/contents.lr  |   3 +-
 content/about/people/biella/contents.lr|  13 ++--
 content/about/people/catalyst/contents.lr  |   4 +-
 content/about/people/cindy/contents.lr |  13 +---
 content/about/people/ewyatt/contents.lr|   3 +-
 content/about/people/flexlibris/contents.lr|   5 +-
 content/about/people/gunner/contents.lr|   5 +-
 content/about/people/julius/contents.lr|  13 ++--
 content/about/people/ln5/contents.lr   |   4 +-
 content/about/people/matt-core/contents.lr |   3 +-
 content/about/people/matt/contents.lr  |   6 +-
 content/about/people/meejah/contents.lr|   4 +-
 content/about/people/megan/contents.lr |  15 ++--
 content/about/people/micahflee/contents.lr |   5 +-
 content/about/people/moritz/contents.lr|   3 +-
 content/about/people/mtigas/contents.lr|   4 +-
 content/about/people/n8fr8/contents.lr |   5 +-
 content/about/people/nickm/contents.lr |   3 +-
 content/about/people/nighat/contents.lr|  16 ++---
 content/about/people/nyinz/contents.lr |   3 +-
 content/about/people/pari/contents.lr  |   3 +-
 content/about/people/phoul/contents.lr |   4 +-
 content/about/people/phw/contents.lr   |   5 +-
 content/about/people/ramy/contents.lr  |  24 ++-
 content/about/people/redshiftzero/contents.lr  |   3 +-
 content/about/people/sjmurdoch/contents.lr |   5 +-
 content/about/people/syverson/contents.lr  |   4 +-
 content/about/people/teor/contents.lr  |   3 +-
 content/about/people/tjr/contents.lr   |   3 +-
 content/about/people/wseltzer/contents.lr  |   4 +-
 content/about/sponsors/DARPA-nrl/contents.lr   |  21 ++
 content/about/sponsors/DARPA-penn/contents.lr  |  21 ++
 .../about/sponsors/USSD-DHRL-harvard/contents.lr   |  18 +
 content/about/sponsors/USSD-DHRL/contents.lr   |  18 +
 content/about/sponsors/access-now/contents.lr  |   9 +++
 content/about/sponsors/anonymous-ngo/contents.lr   |   9 +++
 content/about/sponsors/bbg/contents.lr |   9 +++
 content/about/sponsors/bell-security/contents.lr   |   9 +++
 content/about/sponsors/contents.lr |   2 +
 content/about/sponsors/cyber-ta/contents.lr|   9 +++
 content/about/sponsors/cymru/contents.lr   |  15 
 content/about/sponsors/disconnect/contents.lr  |   9 +++
 content/about/sponsors/eff/contents.lr |   9 +++
 content/about/sponsors/fastly/contents.lr  |  13 
 content/about/sponsors/ffo-germany/contents.lr |   9 +++
 content/about/sponsors/ford-foundation/contents.lr |   9 +++
 content/about/sponsors/freedom-press/contents.lr   |   9 +++
 content/about/sponsors/google-soc/contents.lr  |   9 +++
 content/about/sponsors/google/contents.lr  |   9 +++
 content/about/sponsors/handshake/contents.lr   |  15 
 content/about/sponsors/hivos/contents.lr   |   9 +++
 content/about/sponsors/hrw/contents.lr |   9 +++
 content/about/sponsors/imls-ny/contents.lr |  15 
 content/about/sponsors/individuals/contents.lr |  15 
 content/about/sponsors/internews-eu/contents.lr|   9 +++
 content/about/sponsors/mdf/contents.lr