Merge branch 'microdesc'

ChangeLog

doc/spec/proposals/162-consensus-flavors.txt

src/common/container.c

src/common/container.h

src/common/crypto.c

src/common/crypto.h

src/common/util.c

src/common/util.h

src/or/Makefile.am

src/or/control.c

src/or/directory.c

src/or/dirserv.c

src/or/dirvote.c

src/or/main.c

src/or/microdesc.c

src/or/networkstatus.c

src/or/or.h

src/or/rendcommon.c

src/or/router.c

src/or/routerlist.c