Merge remote branch 'origin/maint-0.2.1'

LICENSE

Makefile.am

contrib/bundle.nsi

contrib/netinst.nsi

contrib/polipo/README

src/common/address.c

src/common/address.h

src/common/aes.c

src/common/aes.h

src/common/compat.c

src/common/compat.h

src/common/container.c

src/common/container.h

src/common/crypto.c

src/common/crypto.h

src/common/ht.h

src/common/log.c

src/common/log.h

src/common/memarea.c

src/common/memarea.h