Merge remote-tracking branch 'purple/master'

This commit is contained in:
Jeff Becker 2018-05-14 07:32:12 -04:00
commit 408e0c3bd7
No known key found for this signature in database
GPG key ID: F357B3B42F6F9B05
3 changed files with 225 additions and 2 deletions

5
.gitignore vendored
View file

@ -10,10 +10,13 @@ keygen
keyinfo
famtool
i2pbase64
regaddr
routerinfo
vain
# private key files
*.dat
*.pem
# certificates
*.crt
*.crt