[tor-commits] [tpo/master] Merge branch 'friends-of-tor'

[gus at torproject.org]

commit 5ee0f509c38b6e6d1b363f699aa77ff17eec6268
Merge: 7a25c50e e39a1408
Author: gus <gus at torproject.org>
Date:   Tue Nov 3 16:10:42 2020 -0500

    Merge branch 'friends-of-tor'

 .htaccess | 7 +++++++
 1 file changed, 7 insertions(+)