Merge branch 'maint'

Conflicts:
	src/pacman/package.c

Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 1 insertions, 0 deletions

diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
index 558d6158..ee43dde1 100644
--- a/scripts/pacman-key.sh.in
+++ b/scripts/pacman-key.sh.in
@@ -166,6 +166,7 @@ initialize() {
 	add_gpg_conf_option "$conffile" 'lock-never'
 	keyserv=${KEYSERVER:-$DEFAULT_KEYSERVER}
 	add_gpg_conf_option "$conffile" 'keyserver' "$keyserv"
+	add_gpg_conf_option "$conffile" 'keyserver-options' 'timeout=10'
 
 	# set up a private signing key (if none available)
 	if [[ $(secret_keys_available) -lt 1 ]]; then