diff options
| author | teor <teor@torproject.org> | 2019-10-23 09:59:07 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-23 09:59:07 +1000 |
| commit | 65545e13452bf042087bc99e7a998427941eee79 (patch) | |
| tree | 496878cf3d4d95adb04e3a316cb0c665952cf96f | |
| parent | b45048feaf0db75108333f86e0d70e08e8a90382 (diff) | |
| parent | 8bc65cda4423d27896dcf3060cbe4d6abcdd3438 (diff) | |
| download | tor-65545e13452bf042087bc99e7a998427941eee79.tar.gz tor-65545e13452bf042087bc99e7a998427941eee79.zip | |
Merge branch 'maint-0.4.1' into maint-0.4.2
`git merge --strategy ours` to use STATIC for unit tests in
maint-0.4.2.
0 files changed, 0 insertions, 0 deletions