Merge remote-tracking branch 'public/bug1031'

changes/bug1031

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/compat_libevent.h

src/common/container.c

src/common/container.h

src/common/crypto.c

src/common/crypto.h

src/common/log.c

src/common/memarea.c

src/common/memarea.h

src/common/mempool.c

src/common/mempool.h

src/common/torgzip.h

src/common/torint.h

src/common/torlog.h