commit 1ef2ce9f2f80b8c96f1fc1c5c5f3525bc2fdc5d9 Merge: 57931fae0 97c9ced70 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 21 11:30:31 2018 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

.gitignore | 3 +++ configure.ac | 38 +++++++++++++++++++++++++++++--------- warning_flags.in | 1 + 3 files changed, 33 insertions(+), 9 deletions(-)