commit f467771634299c3733480cacc6d9059cbd8abf45 Merge: 98a049849 306563ac6 Author: Nick Mathewson nickm@torproject.org Date: Fri Apr 6 16:18:47 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

changes/bug25732 | 4 ++++ src/rust/include.am | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)