commit 2d227dcfcbf509a9fee93084425ac1e7e732185c Merge: f704c29e0 3260914db Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 19 10:18:56 2018 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

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