Merge pull request #158 from fanout/develop

update polarssl and add TLS server name indication (SNI) support
Remove profile.so from target 'all'.

This was removed from the master branch, but not the develop branch.
Merge pull request #167 from musl/develop

Remove profile.so from target 'all'.
Add a few MIME type mappings
Merge pull request #170 from ameuret/add-mimes

Add a few MIME type mappings
Fix small typo in managing.tex

The "Simple Configuration File" section loads examples/configs/sample.conf but
then later explains that it loaded "the mongrel2.conf into it".

Fix the explanation.
Suggest some grammatical changes to managing.tex

Adjust a few sentences that looked odd on first read.
Merge pull request #176 from cpick/typo

Suggest some grammatical changes and fix typos in managing.tex
Bump version for hotfix branch
Fix code for killing deliver task

There really should be a better way, but that will require significant
changes to io.c so that we can interrupt a task doing a read.  This
should work, and will complain in the log when it isn't working.
Merge branch 'hotfix/1.8.1' into develop

Conflicts:
	src/connection.c
	src/connection.h
Messed up slightly merging in 1.8.1 hotfix

That's what I get for not running tests after merge; bad Jason.
no_clobber_xff option