bump to 0.2.0.10-alphator-0.2.0.10-alpha

svn:r12455

5 files changed, 14 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 3a64eaa03f..9957844cd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,8 @@ Changes in version 0.2.0.10-alpha - 2007-11-10
       to advertise as Guards: they must be in the top 7/8 in terms of
       how long we have known about them, and above the median of those
       nodes in terms of weighted fractional uptime.
+    - Make "not enough dir info yet" warnings describe *why* Tor feels
+      it doesn't have enough directory info yet.
 
   o Major bugfixes:
     - Stop servers from crashing if they set a Family option (or
@@ -57,11 +59,11 @@ Changes in version 0.2.0.10-alpha - 2007-11-10
 
   o Minor features:
     - Clients now hold circuitless TLS connections open for 1.5 times
-      MaxCircuitDirtiness, since it is likely that they'll need to build
-      a circuit over them within that timeframe. Previously, they held
-      them open only for KeepalivePeriod.
-    - Use "If-Modified-Since" to avoid retrieving consensus networkstatuses
-      that we already have.
+      MaxCircuitDirtiness (15 minutes), since it is likely that they'll
+      rebuild a new circuit over them within that timeframe. Previously,
+      they held them open only for KeepalivePeriod (5 minutes).
+    - Use "If-Modified-Since" to avoid retrieving consensus
+      networkstatuses that we already have.
     - When we have no consensus, check FallbackNetworkstatusFile (defaults
       to $PREFIX/share/tor/fallback-consensus) for a consensus.  This way
       we start knowing some directory caches.
@@ -75,8 +77,6 @@ Changes in version 0.2.0.10-alpha - 2007-11-10
     - Authorities send back an X-Descriptor-Not-New header in response to
       an accepted-but-discarded descriptor upload.  Partially implements
       fix for bug 535.
-    - Make "not enough dir info yet" warnings describe *why* Tor feels
-      it doesn't have enough directory info yet.
     - Make the log message for "tls error. breaking." more useful.
     - Better log messages about certificate downloads, to attempt to
       track down the second incarnation of bug 546.
@@ -100,18 +100,18 @@ Changes in version 0.2.0.10-alpha - 2007-11-10
 
   o Minor bugfixes:
     - Refuse to start if both ORPort and UseBridges are set. Bugfix
-      on 0.2.0.x.
+      on 0.2.0.x, suggested by Matt Edman.
     - Don't stop fetching descriptors when FetchUselessDescriptors is
       set, even if we stop asking for circuits. Bugfix on 0.1.2.x;
       reported by tup and ioerror.
     - Better log message on vote from unknown authority.
-    - Don't log "Launching 0 request for 0 router".
+    - Don't log "Launching 0 request for 0 router" message.
 
   o Minor bugfixes (memory leaks):
     - Stop leaking memory every time we parse a v3 certificate. Bugfix
       on 0.2.0.1-alpha.
     - Stop leaking memory every time we load a v3 certificate. Bugfix
-      on 0.2.0.1-alpha.  Fixes Bug 536
+      on 0.2.0.1-alpha. Fixes Bug 536.
     - Stop leaking a cached networkstatus on exit.  Bugfix on
       0.2.0.3-alpha.
     - Stop leaking voter information every time we free a consensus.
diff --git a/configure.in b/configure.in
index 13ac3429da..10b9d428e0 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson
 dnl See LICENSE for licensing information
 
 AC_INIT
-AM_INIT_AUTOMAKE(tor, 0.2.0.9-alpha-dev)
+AM_INIT_AUTOMAKE(tor, 0.2.0.10-alpha)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index f727091632..5cbeac36f2 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -5,7 +5,7 @@
 ;
 !include "MUI.nsh"
 
-!define VERSION "0.2.0.9-alpha-dev"
+!define VERSION "0.2.0.10-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/"
 
diff --git a/src/or/rephist.c b/src/or/rephist.c
index bd4d837fbc..a29decfbaa 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -456,7 +456,7 @@ rep_hist_get_weighted_time_known(const char *id, time_t when)
 }
 
 /** Return true if we've been measuring MTBFs for long enough to
- * prounounce on Stability. */
+ * pronounce on Stability. */
 int
 rep_hist_have_measured_enough_stability(void)
 {
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 8396f6e701..bdafc8a969 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -227,6 +227,6 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.0.9-alpha-dev"
+#define VERSION "0.2.0.10-alpha"