commit e0f9a8222b53772a6879ecddb41738a223e3b888 Merge: c35aded00 37bd7fa50 Author: teor <teor@torproject.org> Date: Sat Aug 10 07:21:31 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1229' into maint-0.2.9 changes/bug30041 | 5 +++++ src/or/buffers.c | 4 +++- src/or/connection.c | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-)