aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-03-13 16:57:03 -0400
committerNick Mathewson <nickm@torproject.org>2020-03-13 16:57:03 -0400
commit2f4fa423c30c81092f06fb97c20f5d281b3cfac7 (patch)
treea789dc6a08d7ba6cb493d7b1f6f9e4807dd74716 /.travis.yml
parent2c1a49c4640d807ce0abfd01a011e5d4cc240f69 (diff)
parent7a9e2a261b44b93e244c04593dee8f7757ba32bc (diff)
downloadtor-2f4fa423c30c81092f06fb97c20f5d281b3cfac7.tar.gz
tor-2f4fa423c30c81092f06fb97c20f5d281b3cfac7.zip
Merge branch 'maint-0.4.1' into maint-0.4.2
"ours" to avoid version bump.
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions