Merge branch 'maint-0.3.5' into maint-0.4.2
commit68f8250cbb6f1844e7f16f5f1bc8063b8bbfdf14
authorNick Mathewson <nickm@torproject.org>
Mon, 10 Aug 2020 23:32:49 +0000 (10 19:32 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 10 Aug 2020 23:32:49 +0000 (10 19:32 -0400)
tree77f24e28f6a17c00c6779fb9643d73880c9640b6
parent352991c843e2c0404fd44178cbf3df32cc365bc1
parente873c7e893987f5ad90ef401e6f986c62b4fc42d
Merge branch 'maint-0.3.5' into maint-0.4.2
src/feature/rend/rendclient.c