Merge branch 'ticket20657_nickm_bugfixes_squashed'

src/ext/ed25519/donna/ed25519_tor.c

src/ext/ed25519/ref10/blinding.c

src/or/circuitlist.c

src/or/circuitlist.h

src/or/circuituse.c

src/or/circuituse.h

src/or/connection_edge.c

src/or/directory.c

src/or/directory.h

src/or/hs_cache.c

src/or/hs_cell.c

src/or/hs_cell.h

src/or/hs_circuit.c

src/or/hs_circuit.h

src/or/hs_common.c

src/or/hs_common.h

src/or/hs_descriptor.c

src/or/hs_descriptor.h

src/or/hs_ident.c

src/or/hs_ident.h