]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10e442b e2e09a2)
Merge remote-tracking branch 'teor/feature17863'
authorNick Mathewson <nickm@torproject.org>
Wed, 16 Dec 2015 13:48:28 +0000 (08:48 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 16 Dec 2015 13:48:28 +0000 (08:48 -0500)

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