]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 118bdc3 f19d6b8)
Merge remote-tracking branch 'teor/bug17638-ipv6-ersatz-socketpair'
authorNick Mathewson <nickm@torproject.org>
Thu, 19 Nov 2015 15:48:40 +0000 (10:48 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 19 Nov 2015 15:48:40 +0000 (10:48 -0500)

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