summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-03-06 11:52:22 -0500
committerNick Mathewson <nickm@torproject.org>2014-03-06 11:52:22 -0500
commita50690e68f8a332321e88f0ac8c3046186bc1c1f (patch)
treecfd92cd857d8624d04db026d783ba00a9848e0a8
parent4a2a1e572ec789efee2779e00d920a70892845cc (diff)
parentcbf9e742368158b927249913b395b3796d847a92 (diff)
downloadtor-a50690e68f8a332321e88f0ac8c3046186bc1c1f.tar.gz
tor-a50690e68f8a332321e88f0ac8c3046186bc1c1f.zip
Merge remote-tracking branch 'origin/maint-0.2.4'
-rw-r--r--changes/bug93934
-rw-r--r--src/or/config.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug9393 b/changes/bug9393
new file mode 100644
index 0000000000..9aedd1260b
--- /dev/null
+++ b/changes/bug9393
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - Give the correct URL in the warning message that we present
+ when the user is trying to run a Tor relay on an ancient version
+ of Windows. Fixes bug 9393.
diff --git a/src/or/config.c b/src/or/config.c
index 4c292d82bf..c822a8475e 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2455,7 +2455,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
!strcmpstart(uname, "Windows Me"))) {
log_warn(LD_CONFIG, "Tor is running as a server, but you are "
"running %s; this probably won't work. See "
- "https://wiki.torproject.org/TheOnionRouter/TorFAQ#ServerOS "
+ "https://www.torproject.org/docs/faq.html#BestOSForRelay "
"for details.", uname);
}