[tor-commits] [tor/master] Merge branch 'bug25936-031' into bug25936-032