]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d637468 1c5c5f0)
Merge branch 'maint-0.3.2'
authorNick Mathewson <nickm@torproject.org>
Mon, 8 Jan 2018 16:10:53 +0000 (11:10 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 8 Jan 2018 16:10:53 +0000 (11:10 -0500)
There was a merge conflict on fallback_dirs.inc, which we resolve in
favor of the newly generated version for #24801.


Trivial merge
Mirror of https://git.torproject.org/tor.git