commit 99f94feb6a778f16becbc8386bd7536840bc3ab7 Merge: b584152 ae98dd2 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 22 08:36:39 2015 -0400

Merge branch 'bug17109_v2_squashed'

changes/bug17109 | 4 ++++ configure.ac | 13 +++++++++++++ 2 files changed, 17 insertions(+)