]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6be486 1b70497)
Merge remote-tracking branch 'teor/fix-multi-dir'
authorNick Mathewson <nickm@torproject.org>
Thu, 17 Dec 2015 01:04:49 +0000 (20:04 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 17 Dec 2015 01:04:49 +0000 (20:04 -0500)

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