bump maint-0.2.4 to 0.2.4.25-dev
Whoops, bump the version properly.
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
bump maint-0.2.5 to 0.2.5.9-rc-dev
Merge branch 'maint-0.2.5' into release-0.2.5

Conflicts:
	configure.ac
	contrib/win32build/tor-mingw.nsi.in
	src/win32/orconfig.h