commit ef975432703754ca8ea10ac6db5ec171447bb345 Merge: b7018b1a2 02009c66c Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 20 07:49:59 2018 -0500

Merge remote-tracking branch 'tor-github/pr/607' into maint-0.3.5

Makefile.am | 2 +- changes/bug28568 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)