]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3e3c6c 1eb2c0c)
Merge commit '1eb2c0cbd3a9be2650419bd07474770629261f56'
authorNick Mathewson <nickm@torproject.org>
Mon, 15 Jun 2015 14:19:32 +0000 (10:19 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 15 Jun 2015 14:19:32 +0000 (10:19 -0400)
This is an 'ours' merge to leave the version number alone.


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