commit 2de588ffdbb3502ad680283ef5363125a1966de2 Merge: 6beeb1007 564ff506e Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 26 13:02:26 2017 -0400

Merge branch 'ticket23602_029'

changes/ticket23602 | 6 ++++++ configure.ac | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-)