Whoops, bump the version properly.
Merge branch 'maint-0.2.4' into release-0.2.4

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