commit 315667c4483bdf6a7b1670051ae4a7a78bba1a55 Merge: 723f048 75c6fdd Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jun 28 13:54:12 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 src/or/directory.h | 1 - 1 file changed, 1 deletion(-)