commit 57deb20f357eac5fe0a8467d6dd8ef9a10050808 Merge: 7cbda1181 40c64f45f Author: Nick Mathewson <nickm@torproject.org> Date: Thu Nov 9 08:02:36 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/or/config.c | 5 ----- 1 file changed, 5 deletions(-)