summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-05-03 13:37:33 -0400
committerNick Mathewson <nickm@torproject.org>2018-05-03 13:37:33 -0400
commit1bbe75da6db551e2c5afe32efe68eb8ea7b60048 (patch)
treee4d2cd93e0538bcce174c3a13d3ffbd50fe3bb25 /.travis.yml
parentc66b512671cf1711c7325db664335f1694bb3109 (diff)
parentd96ddf8f1b143934077bc4c1f54fa8a38087e342 (diff)
downloadtor-1bbe75da6db551e2c5afe32efe68eb8ea7b60048.tar.gz
tor-1bbe75da6db551e2c5afe32efe68eb8ea7b60048.zip
Merge remote-tracking branch 'teor/bug25998' into maint-0.3.3
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions