[tor-commits] [tor/maint-0.3.5] Travis: merge before_cache from 29036 and 29962