]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 654769b 254c1ba)
Merge branch 'maint-0.2.9' into maint-0.3.5
authorteor <teor@torproject.org>
Fri, 9 Aug 2019 21:25:57 +0000 (07:25 +1000)
committerteor <teor@torproject.org>
Fri, 9 Aug 2019 21:25:57 +0000 (07:25 +1000)
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.


Trivial merge
Mirror of https://git.torproject.org/tor.git