commit 6a1a93585064bf8752589ae2781443387c90bb73 Merge: 718adaa 0344fe8 Author: Isis Lovecruft isis@torproject.org Date: Thu Mar 26 23:55:14 2015 +0000

Merge branch 'fix/15464-ci-directives_r1' into develop

.travis.yml | 21 ++------------------- scripts/install-dependencies | 40 ++++++++++++++++++++++++++++++++++++++++ scripts/setup-tests | 29 +++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 19 deletions(-)