summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-05-10 19:29:46 +0000
committerNick Mathewson <nickm@torproject.org>2007-05-10 19:29:46 +0000
commit4fce4886bc718aa51c108845f03678f9828c42ae (patch)
tree940e7040fb195f9c6fa633443986da867c23301c
parent1d5beb0df962fb12a4c674c5ea8fa9455ee83c76 (diff)
downloadtor-4fce4886bc718aa51c108845f03678f9828c42ae.tar.gz
tor-4fce4886bc718aa51c108845f03678f9828c42ae.zip
r12720@catbus: nickm | 2007-05-10 15:29:24 -0400
Backport r10087: Include micro-versions in network-status documents. svn:r10161
-rw-r--r--ChangeLog5
-rw-r--r--src/or/dirserv.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d3d55d8b8..bd2dda0d2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,11 @@ Changes in version 0.1.2.14 - 2007-0?-??
- Actually set the purpose correctly for descriptors inserted with
purpose=controller.
+ o Minor features:
+ - When routers publish SVN revisions in their router descriptors,
+ authorities now include those versions correctly in networkstatus
+ documents.
+
Changes in version 0.1.2.13 - 2007-04-24
o Minor fixes:
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index ff7f7cdbff..a2ff421ebf 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1679,6 +1679,8 @@ generate_v2_networkstatus(void)
outp += strlen(outp);
if (ri->platform && !strcmpstart(ri->platform, "Tor ")) {
const char *eos = find_whitespace(ri->platform+4);
+ if (eos && !strcmpstart(eos, " (r"))
+ eos = find_whitespace(eos+1);
if (eos) {
char *platform = tor_strndup(ri->platform, eos-(ri->platform));
if (tor_snprintf(outp, endp-outp,