From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 9 Aug 2014 19:57:06 +0000 (-0400)
Subject: Fix some URLs in the README
X-Git-Tag: tor-0.2.5.7-rc~19^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4056c61608f1ede0da56559cb7e56ec2087dc659;p=thirdparty%2Ftor.git

Fix some URLs in the README

patch from mttp; fixes 12830
---

diff --git a/README b/README
index b2a391aa61..e878476aa6 100644
--- a/README
+++ b/README
@@ -10,17 +10,16 @@ Home page:
         https://www.torproject.org/
 
 Download new versions:
-        https://www.torproject.org/download.html
+        https://www.torproject.org/download/download.html
 
 Documentation, including links to installation and setup instructions:
-        https://www.torproject.org/documentation.html
+        https://www.torproject.org/docs/documentation.html
 
 Making applications work with Tor:
-        https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO
+        https://wiki.torproject.org/projects/tor/wiki/doc/TorifyHOWTO
 
 Frequently Asked Questions:
-        https://www.torproject.org/faq.html
-        https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ
+        https://www.torproject.org/docs/faq.html
 
 
 To get started working on Tor development:
diff --git a/changes/bug12830 b/changes/bug12830
new file mode 100644
index 0000000000..835ebe2fa7
--- /dev/null
+++ b/changes/bug12830
@@ -0,0 +1,4 @@
+  o Documentation:
+    - Adjust the URLs in the README to refer to the new locations of
+      several documents on the website. Patch from Matt Pagan. Fixes
+      bug 12830.