Merge branch 'always_init_base'
commitabc9ce324e7a0c6a482a861f48fc6bbf0589986b
authorNick Mathewson <nickm@torproject.org>
Thu, 4 Feb 2016 18:20:21 +0000 (4 13:20 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 4 Feb 2016 18:20:21 +0000 (4 13:20 -0500)
treee4c30ef853884fc065f5c85eb19da60a0e188a37
parent532a43ed3ff3b11b3ee23d4abb87ef77a94c4ed6
parent1bac468882fd732460d8a25735131d632f977bfe
Merge branch 'always_init_base'