[tor-commits] [tpo/master] Merge and update

[hiro at torproject.org]

commit cbb891e76ec0f877764927f67dde495f8373a7f1
Merge: 0b25274 086b430
Author: hiro <hiro at torproject.org>
Date:   Wed Mar 27 18:32:28 2019 +0100

    Merge and update

 content/about/sponsors/DARPA-penn/contents.lr | 2 +-
 templates/meta.html                           | 1 +
 templates/people.html                         | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)