[tor-commits] [torbutton/master] Merge branch 'bug_30469_v6'