commit 57931fae0a50d2b429fc4c8edf23e6dc96e45417 Merge: bc6f14913 ef9754327 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Dec 20 07:50:04 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 Makefile.am | 2 +- changes/bug28568 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)