[tor-commits] [torflow/master] Merge branch 'scanner-debug'