]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6720628 6a2b4db)
Merge remote-tracking branch 'teor/bug18720'
authorNick Mathewson <nickm@torproject.org>
Tue, 5 Apr 2016 14:08:11 +0000 (10:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 5 Apr 2016 14:08:11 +0000 (10:08 -0400)

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