Merge branch 'maint-0.3.5' into maint-0.4.1
commitb2e543bfe74bb5855a86429c61c0efc91d660719
authorNick Mathewson <nickm@torproject.org>
Fri, 13 Mar 2020 20:46:16 +0000 (13 16:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 13 Mar 2020 20:46:16 +0000 (13 16:46 -0400)
tree85a0de04369f0b1cbf22808fd6f2f2e72657935b
parentc96cf1494357af5a2fd0309ef3d26aba52105edb
parentb9d71f3848a2858dc0a3c5232c85d97525aacd25
Merge branch 'maint-0.3.5' into maint-0.4.1
src/lib/tls/buffers_tls.c