Merge branch 'maint-0.4.5'
commit2243fc3ad1bb33ca5f4a37952bb474d8314d5325
authorNick Mathewson <nickm@torproject.org>
Thu, 21 Jan 2021 18:19:49 +0000 (21 13:19 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 21 Jan 2021 18:19:49 +0000 (21 13:19 -0500)
tree92a41ba6c4b83e0256c079ba3b043eba02fe1c85
parent8a2786072008f18ccd5bace4f014057d06345af0
parent71fd30b75ad028dfce69563792547f06fdf9d3c2
Merge branch 'maint-0.4.5'
src/app/config/config.c
src/feature/client/entrynodes.c