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