Merge branch 'bug23817_031' into maint-0.3.2
commitda82e0b5795c449f4442c87e065e9a60da4892a8
authorNick Mathewson <nickm@torproject.org>
Mon, 20 Nov 2017 19:29:50 +0000 (20 14:29 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 20 Nov 2017 19:29:50 +0000 (20 14:29 -0500)
treed120f3c7133070b6adfd59cfc306a3599793c197
parente2d8300c1060050dad9092e211c6753376b87ad6
parent69f93f806c4531e9498257578a10935e7859390f
Merge branch 'bug23817_031' into maint-0.3.2
src/or/entrynodes.c
src/or/entrynodes.h