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

changes/manual_uri_in_torrc

@@ -0,0 +1,3 @@
+  o Minor bugfixes (documentation):
+   - Fix the URL for the online version of the manual that's listed in
+     torrc.sample.