# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1450869067 -3600
# Node ID 89221daefae9c3afd61e06e1ba077c8cb3ec03b2
# Parent  7d0ce5e6a6d3b9c4603949270db1c80a778cdf2d# Parent  b5bc9f77f096d9e6a195b1d9712a60098e7a25c6
Merge 0.9->0.10

diff -r 7d0ce5e6a6d3 -r 89221daefae9 certs/Makefile
--- a/certs/Makefile	Wed Dec 23 12:10:26 2015 +0100
+++ b/certs/Makefile	Wed Dec 23 12:11:07 2015 +0100
@@ -59,5 +59,5 @@
 	sed 's,example\.com,$*,g' openssl.cnf > $@
 
 %.key:
-	openssl genrsa $(keysize) > $@
-	@chmod 400 $@
+	umask 0077 && openssl genrsa -out $@ $(keysize)
+	@chmod 400 $@ -c
diff -r 7d0ce5e6a6d3 -r 89221daefae9 plugins/mod_admin_telnet.lua