commit 36806e9830688973257f1f669ef8a751fa55757b Merge: d084d3246 4bb287aa3 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 27 09:09:34 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bastet_v6 | 4 ++++ src/or/config.c | 1 + 2 files changed, 5 insertions(+)