[tor-commits] [tor/main] Merge remote-tracking branch 'tor-gitlab/mr/338' into maint-0.4.5

2021-10-21 Thread ahf
commit 0135fb028c8ca0ce310009f20efef89e53a36f2c Merge: 5717b88bcb 265cca935a Author: Alexander Færøy Date: Thu Oct 21 12:35:26 2021 + Merge remote-tracking branch 'tor-gitlab/mr/338' into maint-0.4.5 changes/ticket40337| 16 doc/man/tor.1.txt

[tor-commits] [tor/main] Merge remote-tracking branch 'tor-gitlab/mr/338'

2021-06-14 Thread nickm
commit d642da020e750f6cff65755dcd66fed6eed2b443 Merge: 982829650c 265cca935a Author: Nick Mathewson Date: Mon Jun 14 13:10:18 2021 -0400 Merge remote-tracking branch 'tor-gitlab/mr/338' changes/ticket40337| 16 doc/man/tor.1.txt | 5 + src/ap