diff options
| author | teor <teor@torproject.org> | 2020-02-13 13:58:13 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-02-13 13:58:13 +1000 |
| commit | f021389e92753e1c6bd76c1525e276e174bd897c (patch) | |
| tree | b2eae0b81426df28c2d9114b85dcbad273786bb7 /ChangeLog | |
| parent | ff52205362f5d60c209f298a3e3679bc65bdf539 (diff) | |
| parent | c96cf1494357af5a2fd0309ef3d26aba52105edb (diff) | |
| download | tor-f021389e92753e1c6bd76c1525e276e174bd897c.tar.gz tor-f021389e92753e1c6bd76c1525e276e174bd897c.zip | |
Merge branch 'bug33195_041' into bug33195_042
Conflicts:
* Keep RUST_VERSION from maint-0.4.2
* Keep the commented-out allow_failure entries from bug33195_041
Diffstat (limited to 'ChangeLog')
0 files changed, 0 insertions, 0 deletions