]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.9' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Mon, 1 Jul 2019 18:25:12 +0000 (14:25 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 1 Jul 2019 18:25:12 +0000 (14:25 -0400)
1  2 
src/app/config/fallback_dirs.inc

Simple merge