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

[hiro at torproject.org]

commit b26b4d3fe3b88918f8c210e1d98872c928d5ee5a
Merge: 45ac7bb 40a2526
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Wed Nov 23 02:34:54 2016 +0100

    Merge branch 'master' into staging

 .htaccess                           |   6 +-
 about/en/contact.wml                |   2 +-
 about/en/jobs-coredev.wml           | 190 ++++++++++++++++-----------------
 about/en/jobs.wml                   |   1 +
 donate/en/donate-amazon.wml         |  42 --------
 donate/en/donate-appelbaum.wml      |   0
 donate/en/donate-banner.wml         |   0
 donate/en/donate-blog-alison.wml    |   0
 donate/en/donate-blog-benw.wml      |   0
 donate/en/donate-blog-cory.wml      |   0
 donate/en/donate-blog-ellsberg.wml  |   0
 donate/en/donate-blog-landau.wml    |   0
 donate/en/donate-blog-molly.wml     |   0
 donate/en/donate-blog-nanni.wml     |   0
 donate/en/donate-blog-rabbirob.wml  |   0
 donate/en/donate-chaos.wml          |   0
 donate/en/donate-download.wml       |   0
 donate/en/donate-george-torwell.wml |   0
 donate/en/donate-hardware.wml       |  35 -------
 donate/en/donate-hp.wml             |   0
 donate/en/donate-hpbanner.wml       |   0
 donate/en/donate-roger.wml          |   0
 donate/en/donate-service.wml        |  45 --------
 donate/en/donate-snowden.wml        |   0
 donate/en/donate-tbb.wml            |   0
 donate/en/donate-twitter.wml        |   0
 donate/en/donate.wml                | 203 ------------------------------------
 getinvolved/en/relays.wml           |   7 +-
 28 files changed, 104 insertions(+), 427 deletions(-)