[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5

[teor at torproject.org]

commit 5df0b36623005526588c35cb63b47dd256dcc5b7
Merge: 654769bce 254c1bac4
Author: teor <teor at torproject.org>
Date:   Sat Aug 10 07:25:57 2019 +1000

    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.