diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-10-23 19:54:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-10-23 19:54:04 -0400 |
| commit | 131ab9d5233a2f452c608bf85a39255903d036c1 (patch) | |
| tree | b2cc8602755d501b7817f9b1c5973d0b01b4cf2e /.travis.yml | |
| parent | 289a7dbac32a981897e12a3c250f0b6c67eec809 (diff) | |
| parent | fd6078b33a0a174a060a2ae90e9455e6f0ee6fe9 (diff) | |
| download | tor-131ab9d5233a2f452c608bf85a39255903d036c1.tar.gz tor-131ab9d5233a2f452c608bf85a39255903d036c1.zip | |
Merge branch 'maint-0.3.4' into maint-0.3.5
"ours" version to avoid removing rust use declaration.
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions