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