commit 6661c0352faf01460a0c3835ff342e6402796592 Merge: 28673a600 25c90230b Author: Nick Mathewson <nickm at torproject.org> Date: Mon Nov 27 09:09:34 2017 -0500 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bastet_v6 | 4 ++++ src/or/config.c | 1 + 2 files changed, 5 insertions(+)