git.bettercrypto.org
/
ach-master.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3a70104
bc34ccb
)
Merge https://github.com/BetterCrypto/Applied-Crypto-Hardening
author
Aaron Zauner
<azet@azet.org>
Sat, 5 Apr 2014 18:17:05 +0000
(20:17 +0200)
committer
Aaron Zauner
<azet@azet.org>
Sat, 5 Apr 2014 18:17:05 +0000
(20:17 +0200)
Conflicts:
src/practical_settings/ssh.tex
1
2
src/practical_settings/proxy_solutions.tex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/practical_settings/proxy_solutions.tex
Simple merge
git.bettercrypto.org / ach-master.git / commitdiff