]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bc9ff8 af891e7)
Merge remote-tracking branch 'teor/bug22424'
authorNick Mathewson <nickm@torproject.org>
Tue, 30 May 2017 12:50:45 +0000 (08:50 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 30 May 2017 12:50:45 +0000 (08:50 -0400)

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