diff options
| author | teor <teor@torproject.org> | 2019-04-19 11:59:18 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-04-19 11:59:18 +1000 |
| commit | cbce8dedd3703424111928d68dfe8920900ce054 (patch) | |
| tree | 4b2eaaad63918a675349ed5b2d6461c1759e2cbf | |
| parent | 116970dda7d04bfdc1cff0034d5ee9969a6754c4 (diff) | |
| parent | 2460b4461f61c3b0fdeedb5bbfb21847a256a867 (diff) | |
| download | tor-cbce8dedd3703424111928d68dfe8920900ce054.tar.gz tor-cbce8dedd3703424111928d68dfe8920900ce054.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.4
"ours" merge, to avoid taking any changes from PR 792 in 0.3.4.
(We already merged PR 791 for 29665 into 0.3.4.)
0 files changed, 0 insertions, 0 deletions