# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1495119612 -28800
# Node ID bbc0a0ee3843acf69ad14f1924c68a8679c83f7c
# Parent  8747c2b1915265a1ddc9f55f1c4c4308f84e9532# Parent  185c14fa504d1083096ee658f19a05777e358661
merge main

diff -r 8747c2b19152 -r bbc0a0ee3843 dbutil.c
diff -r 8747c2b19152 -r bbc0a0ee3843 dbutil.h
diff -r 8747c2b19152 -r bbc0a0ee3843 dropbearkey.c
diff -r 8747c2b19152 -r bbc0a0ee3843 gensignkey.c
diff -r 8747c2b19152 -r bbc0a0ee3843 svr-kex.c