Merge branch 'develop' into feat/objectify-ccxt

2018-05-02 22:49:55 +02:00
parent 90a107393a bddf009a2b
commit 306885e174
36 changed files with 544 additions and 532 deletions
--- a/docs/telegram-usage.md
+++ b/docs/telegram-usage.md
@@ -127,3 +127,14 @@ Day         Profit BTC      Profit USD

 ## /version
 > **Version:** `0.14.3` 
+
+### using proxy with telegram
+in [freqtrade/freqtrade/rpc/telegram.py](https://github.com/gcarq/freqtrade/blob/develop/freqtrade/rpc/telegram.py) replace
+```
+self._updater = Updater(token=self._config['telegram']['token'], workers=0)
+```
+
+with
+```
+self._updater = Updater(token=self._config['telegram']['token'], request_kwargs={'proxy_url': 'socks5://127.0.0.1:1080/'}, workers=0)
+```