mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-27 22:03:31 +01:00
Merge branch 'maint-0.2.6' into maint-0.2.7
"ours" merge to avoid reverting 17354, which was already fixed in 0.2.7.4-rc.
This commit is contained in:
commit
86d5a6fac0