[tor-commits] [bridgedb/master] Merge branch 'hotfix/0.2.4-travis-matrix-update' into develop