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