diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-10-29 09:22:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-10-29 09:22:58 -0400 |
| commit | 6be596e2dc04a736221b573f73a6324352f8538a (patch) | |
| tree | e1cf7e89647e484b67420d47571bc14f6e9f614c | |
| parent | 4dd8d811d669e245f95ed0fcc59de579e876ab91 (diff) | |
| parent | c5c5f859d37bc46f912cca9ba0fa0e1300062e40 (diff) | |
| download | tor-6be596e2dc04a736221b573f73a6324352f8538a.tar.gz tor-6be596e2dc04a736221b573f73a6324352f8538a.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/config.c
| -rw-r--r-- | changes/bug4340 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug4340 b/changes/bug4340 new file mode 100644 index 0000000000..08098b1cd5 --- /dev/null +++ b/changes/bug4340 @@ -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. + |