[tor-commits] [tor/master] Merge branch 'double-0-check'