[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug8235-diagnostic-rebased' into maint-0.2.4