Merge branch 'tor-github/pr/1909' into maint-0.4.3
commit6b05d447bb5ee8512b33ed2f78223e02c6455096
authorGeorge Kadianakis <desnacked@riseup.net>
Tue, 2 Jun 2020 11:05:33 +0000 (2 14:05 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Tue, 2 Jun 2020 11:05:33 +0000 (2 14:05 +0300)
tree74bc02e50d0f83b199899d14f175420c34175368
parent688d1b3f032b5a84ad5ada23fa8831c07bd76c75
parent39f2411b3f5ab1a50c74fdafb432d5286c451ab7
Merge branch 'tor-github/pr/1909' into maint-0.4.3
src/core/or/circuitlist.c
src/feature/client/entrynodes.c