Merge remote-tracking branch 'origin'

This commit is contained in:
psyc://psyced.org/~lynX 2015-01-28 11:53:52 +01:00
commit 8247e2c804

View File

@ -5,4 +5,5 @@ server=/onion/127.0.0.1#9053
# or you can pass --server=/onion/127.0.0.1#9053
# to dnsmasq on the command line
#
# contributed by alice of notomorrow. thanks!