commit ff65618f16a1ae01b0d8267fa658b214581af524 Merge: e8d7953 3d6ae79 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Aug 23 09:55:37 2016 -0400 Merge remote-tracking branch 'jigsaw/fix-15381' src/or/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)