]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'getentropy_028' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Mon, 5 Dec 2016 15:06:16 +0000 (10:06 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 5 Dec 2016 15:06:16 +0000 (10:06 -0500)

Trivial merge