diff options
| author | teor <teor@torproject.org> | 2019-04-19 11:39:17 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-04-19 11:39:17 +1000 |
| commit | 4d504bf098069538984690de7966a907180c7efe (patch) | |
| tree | 1f024787cacc543a7f94397c8971954d1bf6bd19 | |
| parent | 48e990359b05661f2dd0ae503143ee9b18442475 (diff) | |
| parent | ec213ae8a09505e97215cf9c54d1003c314c91f9 (diff) | |
| download | tor-4d504bf098069538984690de7966a907180c7efe.tar.gz tor-4d504bf098069538984690de7966a907180c7efe.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.4
"ours" merge, to avoid taking any changes from PR 772 in 0.3.4.
(We already merged a different fix for 23790 into 0.3.2 and later.)
0 files changed, 0 insertions, 0 deletions