Merge branch 'maint'

* maint:
http.c: fix compiling with libcurl 7.9.2
import-tars: support symlinks
pull, rebase: simplify to use die()

diff --cc http.c
Simple merge