[tor-commits] [tor/master] Merge branch 'neena-fix-1667'