commit 30b3229252709eeca054ee06cc6e366226723e24 Merge: 53c3174ee 25c90230b Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 27 09:09:34 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bastet_v6 | 4 ++++ src/or/config.c | 1 + 2 files changed, 5 insertions(+)