diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-03-13 16:56:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-03-13 16:56:44 -0400 |
| commit | 7a9e2a261b44b93e244c04593dee8f7757ba32bc (patch) | |
| tree | cd62dec59a73c556134fea0a402ef9f1ad465764 /.travis.yml | |
| parent | 7f0ad3343e2139f368f896ca44f8a9d9d84e6346 (diff) | |
| parent | d17108a187e32a4d5464d2428b8943702c6d5cde (diff) | |
| download | tor-7a9e2a261b44b93e244c04593dee8f7757ba32bc.tar.gz tor-7a9e2a261b44b93e244c04593dee8f7757ba32bc.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.1
"ours" to avoid version bump.
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions