merge stable

diff --cc init.c
Simple merge

diff --cc pgp.c
Simple merge

diff --cc protos.h
Simple merge