resolve conflicts with and merge in martin61 branch so I can start working off that instead

2019-06-27 16:45:30 -04:00
parent 33558398da 7267f1d718
commit 1c775b22d7
5 changed files with 63 additions and 13 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@
 /key.pem
 /_netdb
 i2pseeds.su3
-*.pem
+*.pem
+onion.key