commit eec13dff2c463cb9b185544b9cae88f081ca9acd Merge: 92ce2cb0 b63e9c5b Author: Arturo Filastò <arturo@filasto.net> Date: Fri Jun 30 18:11:23 2017 +0200 Merge branch 'master' into fix/tor-binary LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)