diff options
| author | teor <teor@torproject.org> | 2020-02-12 14:13:15 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-02-12 14:13:15 +1000 |
| commit | 0e00d9369fa159bf0c44d0862e3d1f6b0c40ef50 (patch) | |
| tree | f4baccf623e3aafafc7f998d4535a91201d9313a | |
| parent | de31c4757b6a58a3b5255298918c6d28e100b506 (diff) | |
| parent | ff52205362f5d60c209f298a3e3679bc65bdf539 (diff) | |
| download | tor-0e00d9369fa159bf0c44d0862e3d1f6b0c40ef50.tar.gz tor-0e00d9369fa159bf0c44d0862e3d1f6b0c40ef50.zip | |
Merge branch 'maint-0.4.2' into maint-0.4.3
"ours" merge, because simiar BridgeDistribution fixes have already
been merged to maint-0.4.3. (See 32753.)
The stem changes in 33075 have already been merged to maint-0.4.3,
so this "ours" merge does not affect them.
0 files changed, 0 insertions, 0 deletions