[tor-commits] [tpo/develop] Merge branch 'develop'

commit aa27500a6204fbf5032a3712f876e06ec5b43a13 Merge: a260d8f d324d1d Author: hiro <hiro@torproject.org> Date: Mon Oct 28 18:21:24 2019 +0100 Merge branch 'develop' lego | 2 +- templates/banner.html | 1 + templates/bottom_banner.html | 1 - templates/meta.html | 2 -- 4 files changed, 2 insertions(+), 4 deletions(-)