[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r8516: Restore to previous wording that svk merging made me mess up (in tor/trunk: . src/or)
- To: or-cvs@xxxxxxxxxxxxx
- Subject: [or-cvs] r8516: Restore to previous wording that svk merging made me mess up (in tor/trunk: . src/or)
- From: weasel@xxxxxxxx
- Date: Thu, 28 Sep 2006 19:05:17 -0400 (EDT)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Thu, 28 Sep 2006 19:05:24 -0400
- Reply-to: or-talk@xxxxxxxxxxxxx
- Sender: owner-or-cvs@xxxxxxxxxxxxx
Author: weasel
Date: 2006-09-28 19:05:17 -0400 (Thu, 28 Sep 2006)
New Revision: 8516
Modified:
tor/trunk/
tor/trunk/src/or/directory.c
Log:
r9895@danube: weasel | 2006-09-29 01:05:00 +0200
Restore to previous wording that svk merging made me mess up
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /local/or/tor/trunk [r9895] on 17f730b7-d419-0410-b50f-85ee4b70197a
Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c 2006-09-28 22:59:36 UTC (rev 8515)
+++ tor/trunk/src/or/directory.c 2006-09-28 23:05:17 UTC (rev 8516)
@@ -1025,7 +1025,7 @@
} else {
/* Can we even end up here? -- weasel*/
source = NS_FROM_DIR_BY_FP;
- log_warn(LD_BUG, "we received a networkstatus but we did neither ask"
+ log_warn(LD_BUG, "we received a networkstatus but we didn't ask"
"for it by fp/ nor did we ask for all.");
}
cp = body;