From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 13 Dec 2018 13:26:10 +0000 (-0500)
Subject: Merge branch 'dormant_persist_squashed'
X-Git-Tag: tor-0.4.0.1-alpha~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=69264f96f3561c72d14c1e518ca84ad18557d905;p=thirdparty%2Ftor.git

Merge branch 'dormant_persist_squashed'
---

69264f96f3561c72d14c1e518ca84ad18557d905