[tor-commits] [tpo/staging] Update staging

[gus at torproject.org]

commit dae61c3a1f2b6e0a9d0e8c5d3b2fb490d17533cc
Merge: c19627b7 1e0fad54
Author: gus <gus at torproject.org>
Date:   Thu Aug 20 16:22:21 2020 -0400

    Update staging

 .htaccess-membership                               |   4 +
 .../images/membership/shallot-placeholder.png      | Bin 0 -> 52499 bytes
 assets/static/images/people/ewyatt.png             | Bin 20553 -> 0 bytes
 assets/static/images/people/irl.png                | Bin 42121 -> 0 bytes
 assets/static/images/people/jselon.png             | Bin 29698 -> 0 bytes
 assets/static/images/people/phw.png                | Bin 0 -> 41774 bytes
 assets/static/images/people/sstevenson.png         | Bin 39263 -> 0 bytes
 assets/static/images/privchat/arturo.png           | Bin 0 -> 1006292 bytes
 assets/static/images/privchat/cecylia.png          | Bin 0 -> 1259567 bytes
 assets/static/images/privchat/cory.png             | Bin 0 -> 938762 bytes
 assets/static/images/privchat/felicia.png          | Bin 0 -> 670777 bytes
 assets/static/images/privchat/privchat1-cover.png  | Bin 0 -> 955705 bytes
 assets/static/images/privchat/vrinda.png           | Bin 0 -> 797783 bytes
 content/about/people/alsmith/contents.lr           |   2 +-
 content/about/people/antonela/contents.lr          |   2 +-
 content/about/people/ewyatt/contents.lr            |   2 -
 content/about/people/flexlibris/contents.lr        |   7 +-
 content/about/people/ggus/contents.lr              |   2 +
 content/about/people/gman999/contents.lr           |   4 +-
 content/about/people/irl/contents.lr               |  21 -----
 content/about/people/jselon/contents.lr            |  17 ----
 content/about/people/karsten/contents.lr           |   2 +-
 content/about/people/phoul/contents.lr             |   5 +-
 content/about/people/phw/contents.lr               |   2 +
 content/about/people/pospeselr/contents.lr         |   4 +-
 content/about/people/sstevenson/contents.lr        |  21 -----
 .../torbrowser/RecommendedTBBVersions/contents.lr  |  14 ++-
 databags/versions.ini                              |  12 +--
 templates/download-android.html                    |   9 +-
 templates/membership.html                          |  29 ++-----
 templates/privchat.html                            |  95 ++++++++++++++++-----
 31 files changed, 123 insertions(+), 131 deletions(-)