Commit a50690e6 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

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

parents 4a2a1e57 cbf9e742

changes/bug9393

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  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.

src/or/config.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

  }