diff --git a/README.md b/README.md
index 664b8b475..79ce2d19f 100644
--- a/README.md
+++ b/README.md
@@ -50,3 +50,12 @@ Logs can be watched by using `journalctl -fu pleroma.service`
 
 ### Standalone/run by other means
 Run `mix phx.server` in repository's root, it will output log into stdout/stderr
+
+### Using an upstream proxy for federation
+
+Add the following to your `dev.secret.exs` if you want to proxify all http requests that pleroma makes to an upstream proxy server:
+
+    config :pleroma, :http,
+      proxy_url: "127.0.0.1:8123"
+
+This is useful for running pleroma inside Tor or i2p.
diff --git a/config/config.exs b/config/config.exs
index 28335a6d4..05995085c 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -40,6 +40,7 @@
             _ -> "Pleroma dev"
           end
 
+# Configures http settings, upstream proxy etc.
 config :pleroma, :http,
   proxy_url: ""