Merge branch 'bug5040_4773_rebase_3'

changes/bug5040

src/common/crypto.c

src/common/crypto.h

src/common/util.c

src/common/util.h

src/or/buffers.c

src/or/buffers.h

src/or/channel.c

src/or/channel.h

src/or/channeltls.c

src/or/config.c

src/or/config.h

src/or/connection.c

src/or/connection.h

src/or/connection_or.c

src/or/connection_or.h

src/or/control.c

src/or/control.h

src/or/directory.c

src/or/ext_orport.c