]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/memwipe-more-keys'
authorNick Mathewson <nickm@torproject.org>
Mon, 20 Oct 2014 15:12:51 +0000 (11:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 20 Oct 2014 15:12:51 +0000 (11:12 -0400)

Trivial merge