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