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

[gus at torproject.org]

commit b56abf842240dcd8bc7782938555bb2270baded7
Merge: 8b7f1500 48dba788
Author: gus <gus at torproject.org>
Date:   Fri May 22 17:38:38 2020 -0400

    Merge branch 'master' into develop

 .../torbrowser/RecommendedTBBVersions/contents.lr  | 34 ++++------------------
 databags/versions.ini                              |  2 +-
 2 files changed, 6 insertions(+), 30 deletions(-)