commit fa3cad363e90a0a38f553a2b2ba2719c17698d9f Merge: f5bd987c7 fea5c8a01 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

changes/bug23291 | 3 +++ src/test/test-memwipe.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)