commit 519c6ba26c31d801b73e44ca5c760044a7fe06e5 Merge: db4873c46 c7dc65e03 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 15 10:59:57 2017 -0500

Merge remote-tracking branch 'isis/bug24612'

changes/bug24612 | 4 ++++ configure.ac | 7 +++++++ 2 files changed, 11 insertions(+)