diff options
| author | teor <teor@torproject.org> | 2020-02-17 13:46:09 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-02-17 13:46:09 +1000 |
| commit | 334469cc39f329701fa48fb752d35a2cee7edc69 (patch) | |
| tree | f404d541282c5c873ddcd5f029b60b7c7723bb5a /.travis.yml | |
| parent | 25ecdf1409c9d1d33e546cff1e617e14d84fae03 (diff) | |
| parent | c34c101212014f84a8cde3752c198e772f410da7 (diff) | |
| download | tor-334469cc39f329701fa48fb752d35a2cee7edc69.tar.gz tor-334469cc39f329701fa48fb752d35a2cee7edc69.zip | |
Merge branch 'bug33195_master' into ticket33280_master
Conflicts:
* Keep the changes from ticket33280_master
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions