[tor-commits] [sbws/master] Merge branch 'maint-1.1_issue30067_travis' into maint-1.1