]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'always_init_base'
authorNick Mathewson <nickm@torproject.org>
Thu, 4 Feb 2016 18:20:21 +0000 (13:20 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 4 Feb 2016 18:20:21 +0000 (13:20 -0500)

Trivial merge