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