commit 649785d464371f295405ced647b7b10f59053330 Merge: 4a14c2c ae7e2b9 Author: Nick Mathewson nickm@torproject.org Date: Thu May 19 16:01:35 2016 -0400

Merge branch 'link_ftrapv_clang32'

LICENSE | 104 +++++++++++++++++++++++++++++++++++++++++++++ changes/bug19079 | 4 ++ configure.ac | 40 +++++++++++++++++ src/common/include.am | 7 +++ src/ext/README | 7 +++ src/ext/mulodi/LICENSE.TXT | 91 +++++++++++++++++++++++++++++++++++++++ src/ext/mulodi/mulodi4.c | 64 ++++++++++++++++++++++++++++ 7 files changed, 317 insertions(+)