Merge branch 'ticket21889_031_01_squashed'

src/or/circuitlist.c

src/or/hs_circuitmap.c

src/or/hs_circuitmap.h

src/or/hs_intropoint.c

src/or/or.h

src/or/rendmid.c

src/test/test_circuitlist.c

src/test/test_hs_intropoint.c