Merge branch 'master' into revoker

Conflicts:
	letsencrypt/client/auth_handler.py
	letsencrypt/client/client.py
	letsencrypt/client/crypto_util.py
	letsencrypt/client/interfaces.py
	letsencrypt/client/le_util.py
	letsencrypt/client/revoker.py
	letsencrypt/client/standalone_authenticator.py
	letsencrypt/client/tests/apache/dvsni_test.py
	letsencrypt/client/tests/apache/obj_test.py
	letsencrypt/client/tests/recovery_token_test.py
	letsencrypt/client/tests/standalone_authenticator_test.py
	letsencrypt/scripts/main.py
This commit is contained in:
James Kasten
2015-02-18 03:36:53 -08:00
67 changed files with 2297 additions and 849 deletions
+1
View File
@@ -61,6 +61,7 @@ setup(
url="https://letsencrypt.org",
packages=[
'letsencrypt',
'letsencrypt.acme',
'letsencrypt.client',
'letsencrypt.client.apache',
'letsencrypt.client.display',