X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=README.md;h=fcf296c01c4c7b4a9c63dca698e4bc9baa76bc0a;hb=05ba6ca1b8a792dfaa8e636a964a09b766afb4d6;hp=664b8b47548f950d6eed6781535095c47376f4c7;hpb=d7da3ca05d87ce7c0c799031c00dd1a80aba9c18;p=akkoma

diff --git a/README.md b/README.md
index 664b8b475..fcf296c01 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ No release has been made yet, but several servers have been online for months al
 ### Dependencies
 
 * Postgresql version 9.6 or newer
-* Elixir version 1.4 or newer (you will also need erlang-dev, erlang-parsetools, erlang-xmerl packages)
+* Elixir version 1.5 or newer
 * Build-essential tools
 
 ### Configuration
@@ -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` or `prod.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.