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

[gus at torproject.org]

commit 1aef6ad82d2cea13c1f245216f086471f658b56e
Merge: f7d42157 2b99b82a
Author: gus <gus at torproject.org>
Date:   Fri May 22 13:25:23 2020 -0400

    Merge branch 'master' into develop

 content/release/95/contents.lr | 52 ++++++++++++++++++++++++++++++++++++++++++
 content/release/contents.lr    | 11 +++++++++
 templates/release.html         | 19 +++++++++++++++
 templates/releases.html        | 14 ++++++++++++
 4 files changed, 96 insertions(+)