commit 71f84c93b059ca440ae7e428cb8c34b25c1d2a77 Merge: 583ef6042 64c3c6a79 Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 27 09:39:08 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)