aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-08-04 23:59:38 +0000
committerRoger Dingledine <arma@torproject.org>2008-08-04 23:59:38 +0000
commitd5bb361977cf1fa8e9a02cf8bd83e94cccfd0add (patch)
tree967a9af4cf59ca81315a3c2b7aa00311ddc2763f
parentd166b9dc450fb4da0fee8c2e24172bc9bea933a1 (diff)
downloadtor-d5bb361977cf1fa8e9a02cf8bd83e94cccfd0add.tar
tor-d5bb361977cf1fa8e9a02cf8bd83e94cccfd0add.tar.gz
minor fixes
svn:r16407
-rw-r--r--ChangeLog2
-rw-r--r--ReleaseNotes9
-rw-r--r--src/or/dirserv.c2
3 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index d3f7fd0f1..6449a1e88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -560,7 +560,7 @@ Changes in version 0.2.0.21-rc - 2008-03-02
o Minor bugfixes:
- Fix compilation with OpenSSL 0.9.8 and 0.9.8a. All other supported
OpenSSL versions should have been working fine. Diagnosis and patch
- from lodger, Karsten Loesing and Sebastian Hahn. Fixes bug 616.
+ from lodger, Karsten Loesing, and Sebastian Hahn. Fixes bug 616.
Bugfix on 0.2.0.20-rc.
diff --git a/ReleaseNotes b/ReleaseNotes
index 52e022b86..c5ba31c9c 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -455,9 +455,10 @@ Changes in version 0.2.0.30 - 2008-07-15
now we expand "-f ~/.tor/torrc" correctly. Suggested by Matt Edman.
o New config options:
- - New configuration options to override default maximum number of
- servers allowed on a single IP address. This is important for
- running a test network on a single host. XXX
+ - New configuration options AuthDirMaxServersPerAddr and
+ AuthDirMaxServersperAuthAddr to override default maximum number
+ of servers allowed on a single IP address. This is important for
+ running a test network on a single host.
- Three new config options (AlternateDirAuthority,
AlternateBridgeAuthority, and AlternateHSAuthority) that let the
user selectively replace the default directory authorities by type,
@@ -481,7 +482,7 @@ Changes in version 0.2.0.30 - 2008-07-15
- When we have no consensus, check FallbackNetworkstatusFile (defaults
to $PREFIX/share/tor/fallback-consensus) for a consensus. This way
we can start out knowing some directory caches. We don't ship with
- a fallback consensus by default though, because it wasn't making
+ a fallback consensus by default though, because it was making
bootstrapping take too long while we tried many down relays.
- Authorities send back an X-Descriptor-Not-New header in response to
an accepted-but-discarded descriptor upload. Partially implements
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index df3a913a1..e43c57029 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1485,7 +1485,7 @@ dirserv_get_directory(void)
return dirserv_pick_cached_dir_obj(cached_directory, the_directory,
the_directory_is_dirty,
dirserv_regenerate_directory,
- "server directory", V1_AUTHORITY);
+ "v1 server directory", V1_AUTHORITY);
}
/** Only called by v1 auth dirservers.