[tor-commits] [tor/master] Merge branch 'always_init_base'