gabelmoo's IPv4 address changed
Merge branch 'maint-0.2.3' into maint-0.2.4
Merge branch 'maint-0.2.4' into maint-0.2.5

Conflicts:
	src/or/config.c
Merge branch 'maint-0.2.5'