]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95bcd2d e870f62)
Merge remote-tracking branch 'teor/bug16343-master-key-assert'
authorNick Mathewson <nickm@torproject.org>
Wed, 10 Jun 2015 16:40:32 +0000 (12:40 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 10 Jun 2015 16:40:32 +0000 (12:40 -0400)

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