]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 996328f 53f3501)
Merge remote-tracking branch 'teor/ticket24001'
authorNick Mathewson <nickm@torproject.org>
Tue, 2 Jan 2018 15:07:13 +0000 (10:07 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 2 Jan 2018 15:07:13 +0000 (10:07 -0500)

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