[tor-commits] [tech-reports/master] Merge branch 'sjm-reports'