Merge branch 'maint-0.2.9' into maint-0.3.5
commit5653b93a1d25e173bebb8f45d364e3a578572789
authorNick Mathewson <nickm@torproject.org>
Mon, 19 Aug 2019 14:37:21 +0000 (19 10:37 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 19 Aug 2019 14:37:21 +0000 (19 10:37 -0400)
treec7fb16b93e710cea112169ea66f73e0b4a20c276
parentd253b31cec04c35c551618b9b1ffa50ae4426303
parent5a1c3e44f758cda18bb0a0a8ef7c94a0122c85e4
Merge branch 'maint-0.2.9' into maint-0.3.5
src/app/config/auth_dirs.inc