commit a36e627157d873aa2c9659cea0c9e863c50a0f52 Merge: 2c9ef89 4dcccee Author: Isis Lovecruft isis@torproject.org Date: Tue Feb 10 23:04:20 2015 +0000

Merge branch 'hotfix/0.2.4-travis-matrix-update' into develop

.travis.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)