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