commit 8183640ada0ccef0c1f123a312b99c87269a1cae Merge: a8df39e95 3260914db Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 19 10:18:57 2018 -0500

Merge branch 'maint-0.3.5'

changes/bug28485 | 3 +++ src/tools/include.am | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)