Merge remote-tracking branch 'origin/maint-0.2.4'

This commit is contained in:
Nick Mathewson 2014-03-06 11:52:22 -05:00
commit a50690e68f
2 changed files with 5 additions and 1 deletions

4
changes/bug9393 Normal file
View File

@ -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.

View File

@ -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);
}