From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 13 Apr 2021 14:36:01 +0000 (-0400)
Subject: Merge branch 'maint-0.4.5'
X-Git-Tag: tor-0.4.6.2-alpha~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1b48a28a7476d8c29cb505ad53daa3c4fe275500;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.5'
---

1b48a28a7476d8c29cb505ad53daa3c4fe275500