Merge remote-tracking branch 'origin/pans'

Conflicts:
	src/peer.c
	src/peer.h
	src/request.c
	src/request.h