mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-09-20 12:22:14 +02:00
Merge branch 'maint-0.4.2'
Use "-s ours" to avoid version bump.
This commit is contained in:
commit
39c5e1b849
Use "-s ours" to avoid version bump.