[tor-commits] [tor/master] Merge branch 'nss-travis' into maint-0.3.5