bump to 0.2.4.23
Merge branch 'maint-0.2.4' into maint-0.2.5
bump to 0.2.5.6-alpha
Merge branch 'maint-0.2.5'

Conflicts:
	configure.ac
	contrib/win32build/tor-mingw.nsi.in
	src/win32/orconfig.h
and bring all the changelogs into master too