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