Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
	src/or/config.c
This commit is contained in:
Nick Mathewson 2011-10-29 09:22:58 -04:00
commit 6be596e2dc

5
changes/bug4340 Normal file
View File

@ -0,0 +1,5 @@
o Major bugfixes:
- Don't crash when we're running as a relay and don't have a geoip
file. Bugfix on tor-0.2.2.34; fixes bug 4340. This backports a fix
we've had in master already.