]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 920e3d6 2f2fba8)
Merge branch 'ed25519_voting_fixes_squashed' into maint-0.2.7
authorNick Mathewson <nickm@torproject.org>
Mon, 21 Mar 2016 17:25:12 +0000 (13:25 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 21 Mar 2016 17:25:12 +0000 (13:25 -0400)

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