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