[tor-commits] [tor/master] Merge branch 'bug25686_diagnostic_032' into maint-0.3.2