diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-10-24 12:57:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-10-24 12:57:14 -0400 |
| commit | c78904b6302c53e0778854974c13aa4d5a499bb0 (patch) | |
| tree | 941e575552240b461f48c18c775864defd3d920c /.travis.yml | |
| parent | 6851a08090325dc51b26e80350395c4a0c778cf8 (diff) | |
| parent | b063ca0604d6cc99adf1009818c10ee14d006aab (diff) | |
| download | tor-c78904b6302c53e0778854974c13aa4d5a499bb0.tar.gz tor-c78904b6302c53e0778854974c13aa4d5a499bb0.zip | |
Merge branch 'maint-0.3.4' into maint-0.3.5
"ours" to avoid taking a second instance of 27797.
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions