commit 703ab95e9fb94700b6349f539c58705040ede9a8 Merge: 735855952 b1c4ab0be Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 27 09:09:34 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bastet_v6 | 4 ++++ src/or/config.c | 1 + 2 files changed, 5 insertions(+)