diff options
| author | teor <teor@torproject.org> | 2019-10-23 08:24:30 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-23 08:25:42 +1000 |
| commit | 1ea19d7a5bf538f5b9f0988c2375966f88d87867 (patch) | |
| tree | dac21871cc9b9c9e9e1f9a96a7cc84d96936fb0f | |
| parent | 21c3488af714ade6f07251194165d92f77f06c31 (diff) | |
| parent | 7660a7cf7d4191e44aba0bf3e02a001d7e979d29 (diff) | |
| download | tor-1ea19d7a5bf538f5b9f0988c2375966f88d87867.tar.gz tor-1ea19d7a5bf538f5b9f0988c2375966f88d87867.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.5
`git merge --strategy ours` to take the 0.3.5 changes for 31001,
and ignore the conflicting 0.2.9 changes.
0 files changed, 0 insertions, 0 deletions