Unverified Commit 5df0b366 authored by teor's avatar teor
Browse files

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.
parents 654769bc 254c1bac
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment