Merge branch 'ticket30924_042_04_squashed_merged'

changes/ticket30924

doc/tor.1.txt

scripts/maint/practracker/exceptions.txt

src/app/config/config.c

src/core/or/or.h

src/core/or/or_circuit_st.h

src/core/or/protover.c

src/core/or/versions.c

src/feature/hs/hs_cell.c

src/feature/hs/hs_cell.h

src/feature/hs/hs_circuit.c

src/feature/hs/hs_config.c

src/feature/hs/hs_config.h

src/feature/hs/hs_dos.c

src/feature/hs/hs_dos.h

src/feature/hs/hs_intropoint.c

src/feature/hs/hs_intropoint.h

src/feature/hs/hs_service.c

src/feature/hs/hs_service.h

src/feature/nodelist/nodelist.c