Fetch latest manual from wiki

Signed-off-by: James Valleroy <jvalleroy@mailbox.org>

doc/Tor.raw.xml

@@ -4,6 +4,18 @@
   <articleinfo>
     <title>FreedomBox/Manual/Tor</title>
     <revhistory>
+      <revision>
+        <revnumber>15</revnumber>
+        <date>2018-03-19 06:27:56</date>
+        <authorinitials>JosephNuthalapati</authorinitials>
+        <revremark>Add section on circumventing tor censorship</revremark>
+      </revision>
+      <revision>
+        <revnumber>14</revnumber>
+        <date>2018-03-19 06:25:43</date>
+        <authorinitials>JosephNuthalapati</authorinitials>
+        <revremark>Add section on circumventing tor censorship</revremark>
+      </revision>
       <revision>
         <revnumber>13</revnumber>
         <date>2017-01-07 16:00:24</date>
@@ -118,6 +130,32 @@
     <section>
       <title>Using Tor SOCKS port (advanced)</title>
       <para>FreedomBox provides a Tor SOCKS port that other applications can connect to, in order to route their traffic over the Tor network. This port is accessible on any interfaces configured in the internal firewall zone. To configure the application, set SOCKS Host to the internal network connection's IP address, and set the SOCKS Port to 9050. </para>
+    </section>
+    <section>
+      <title>Circumventing Tor censorship</title>
+      <para>If your ISP is trying to block Tor traffic, you can use tor bridge relays to connect to the tor network.  </para>
+      <para>1. Get the bridge configuration from the <ulink url="https://bridges.torproject.org/bridges">Tor BridgeDB</ulink> </para>
+      <para>
+        <inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Tor?action=AttachFile&amp;do=get&amp;target=tor-bridge-db.png" width="800"/>
+          </imageobject>
+          <textobject>
+            <phrase>Tor BridgeDB</phrase>
+          </textobject>
+        </inlinemediaobject>
+      </para>
+      <para>2. Add the lines to your FreedomBox Tor configuration as show below. </para>
+      <para>
+        <inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Tor?action=AttachFile&amp;do=get&amp;target=tor-bridge-configuration.png" width="800"/>
+          </imageobject>
+          <textobject>
+            <phrase>Tor Configuration Page</phrase>
+          </textobject>
+        </inlinemediaobject>
+      </para>
       <!--rule (<hr>) is not applicable to DocBook-->
       <informaltable>
         <tgroup cols="8">

doc/freedombox-manual.raw.xml

@@ -884,6 +884,32 @@ Primary key fingerprint: BCBE BD57 A11F 70B2 3782  BC57 36C3 6144 0C9B C971]]></
         <title>Using Tor SOCKS port (advanced)</title>
         <para>FreedomBox provides a Tor SOCKS port that other applications can connect to, in order to route their traffic over the Tor network. This port is accessible on any interfaces configured in the internal firewall zone. To configure the application, set SOCKS Host to the internal network connection's IP address, and set the SOCKS Port to 9050. </para>
       </section>
+      <section>
+        <title>Circumventing Tor censorship</title>
+        <para>If your ISP is trying to block Tor traffic, you can use tor bridge relays to connect to the tor network.  </para>
+        <para>1. Get the bridge configuration from the <ulink url="https://bridges.torproject.org/bridges">Tor BridgeDB</ulink> </para>
+        <para>
+          <inlinemediaobject>
+            <imageobject>
+              <imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Tor?action=AttachFile&amp;do=get&amp;target=tor-bridge-db.png" width="800"/>
+            </imageobject>
+            <textobject>
+              <phrase>Tor BridgeDB</phrase>
+            </textobject>
+          </inlinemediaobject>
+        </para>
+        <para>2. Add the lines to your FreedomBox Tor configuration as show below. </para>
+        <para>
+          <inlinemediaobject>
+            <imageobject>
+              <imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Tor?action=AttachFile&amp;do=get&amp;target=tor-bridge-configuration.png" width="800"/>
+            </imageobject>
+            <textobject>
+              <phrase>Tor Configuration Page</phrase>
+            </textobject>
+          </inlinemediaobject>
+        </para>
+      </section>
     </section>
     <section>
       <title>BitTorrent (Transmission)</title>
@@ -7354,7 +7380,36 @@ wget https://www.thinkpenguin.com/files/ath9k_firmware_free-version/htc_7010.fw]
     </section>
     <section>
       <title>Release Notes</title>
-      <para>The following are the release notes for each FreedomBox version.  </para>
+      <para>The following are the release notes for each FreedomBox version. </para>
+      <section>
+        <title>Version 0.26.0 (2018-03-26)</title>
+        <itemizedlist>
+          <listitem>
+            <para>snapshots: Update description </para>
+          </listitem>
+          <listitem>
+            <para>searx: Rewrite url from /searx to /searx/ </para>
+          </listitem>
+          <listitem>
+            <para>manual: Link to manual from each service </para>
+          </listitem>
+          <listitem>
+            <para>Workaround security issues in django-axes </para>
+          </listitem>
+          <listitem>
+            <para>apache: Only regenerate snake oil cert when needed </para>
+          </listitem>
+          <listitem>
+            <para>apache: Explicitly enable the latest version of PHP module </para>
+          </listitem>
+          <listitem>
+            <para>apache: Increase module version number to fix php7.2 </para>
+          </listitem>
+          <listitem>
+            <para>Update translations for Chinese (Simplified), Russian, Czech, German, Norwegian Bokmål, Hungarian, Spanish, and Italian </para>
+          </listitem>
+        </itemizedlist>
+      </section>
       <section>
         <title>Version 0.25.0 (2018-03-12)</title>
         <itemizedlist>