]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7bdbcda 741d2dc)
Merge commit '741d2dc685a0e380bc4d8fbcda5a33b70272b3f7'
authorNick Mathewson <nickm@torproject.org>
Fri, 13 Nov 2015 13:42:31 +0000 (08:42 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 13 Nov 2015 13:42:31 +0000 (08:42 -0500)

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