diff options
| author | teor <teor@torproject.org> | 2019-08-10 07:25:57 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-08-10 07:25:57 +1000 |
| commit | 5df0b36623005526588c35cb63b47dd256dcc5b7 (patch) | |
| tree | 66f00df458b0b5f5d4fbd7dd3c9bb3ef6b6dafc2 /doc/tor.1.txt | |
| parent | 654769bcec3e98bea5e3ac48b2aabffcbe55375e (diff) | |
| parent | 254c1bac453fdb7d3e29a5cde9757542990a6989 (diff) | |
| download | tor-5df0b36623005526588c35cb63b47dd256dcc5b7.tar.gz tor-5df0b36623005526588c35cb63b47dd256dcc5b7.zip | |
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.
Diffstat (limited to 'doc/tor.1.txt')
0 files changed, 0 insertions, 0 deletions