]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'keccak-load-faster'
authorNick Mathewson <nickm@torproject.org>
Tue, 14 Mar 2017 23:47:38 +0000 (19:47 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 14 Mar 2017 23:47:38 +0000 (19:47 -0400)

Trivial merge