From: teor <teor@torproject.org>
Date: Fri, 9 Aug 2019 21:25:57 +0000 (+1000)
Subject: Merge branch 'maint-0.2.9' into maint-0.3.5
X-Git-Tag: tor-0.3.5.9~29^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5df0b36623005526588c35cb63b47dd256dcc5b7;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.9' into maint-0.3.5

Delete src/or/buffers.c which was fixup'ed in 0.2.9 but moved in 0.3.5.
The 0.2.9 fix is not required for the 0.3.5 patch.
Resolves merge conflict caused by 30041.
---

5df0b36623005526588c35cb63b47dd256dcc5b7