I've copied the entries from changes/, labeled the ones that also
appeared in 0.2.4.22, sorted them lightly with a python script
(added to maint), and combined sections with the same name.

I didn't combine sections without a description (e.g. "Minor
bugfixes:"), since we'll probably add a description to those.

fixes bug 12139; bugfix on 0.2.5.1-alpha

Fix for 12115; bugfix on 0.2.5.1-alpha

fixes 12114; bug not in any release.

Improves fix for 12028

(This is how I found out I was trying to test with a kernel too old
for seccomp. I think.)

This is a minimal set of changes for compilation; I need a more
recent kernel to test this stuff.

Bugfix on cfd0ee51; bug not in any released version of tor

Without this fix, when running with bridges, we would try fetching
directory info far too early, and have up to a 60 second delay if we
started with bridge descriptors available.

Fixes bug 11965. Fix on 0.2.3.6-alpha, arma thinks.

fixes part of 12064

There was too much code duplication in doing it the old way, and I
nearly made a copy-and-paste error in the last commit.

fixes part of 12064

Michael Wolf authored 10 years ago and Nick Mathewson committed 10 years ago

Fix for 12064 part 1

Our documentation had the name of this directory wrong.

These are needed under some circumstances if we are running with
expensive-hardening and sandbox at the same time.

fixes 11477, bugfix on 0.2.5.4-alpha (where we introduced
expensive-hardening)

Fixes bug 12032; bugfix on 0.2.5.1-alpha

See discussion on 9553: Some of the build scripts don't like it when
you can't merge maint into release.

Also, don't tolerate changing DirPortFrontPage.

Fixes bug 12028; bugfix on 0.2.5.1-alpha.

None of the things we might exec() can possibly run under the
sanbox, so rather than crash later, we have to refuse to accept the
configuration nice and early.

The longer-term solution is to have an exec() helper, but wow is
that risky.

fixes 12043; bugfix on 0.2.5.1-alpha

This prevents a crash when rotating logs with dirreq-stats enabled

fixes 12035; bugfix on 0.2.5.1-alpha.

Fix for 12041; bugfix on 0.2.5.1-alpha.

This is an "ours" merge, to avoid taking the commit that bumped
maint-0.2.4's version to 0.2.4.22-dev.

(See discussion on #9553)

(ticket 9553)