commit 8230b0768b90d43ac1000ac39d18c5e46367d604 Merge: c61e919ec 471e0096a Author: Nick Mathewson <nickm@torproject.org> Date: Thu Sep 14 10:15:38 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/or/entrynodes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)