]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 957cdb5 fa52b6f)
Merge branch 'openssl_compat'
authorNick Mathewson <nickm@torproject.org>
Wed, 3 Feb 2016 19:46:33 +0000 (14:46 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 3 Feb 2016 19:46:33 +0000 (14:46 -0500)

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