commit 8c8ed91aae24aa1188275dfb6fbd5f6fcbcbe1a8 Merge: 1b04dab60 b7fae0f48 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 13 09:46:50 2018 -0400

Merge remote-tracking branch 'rl1987/bug24891'

changes/bug24891 | 4 ++++ src/common/include.am | 10 ++++++++++ src/or/include.am | 4 ++++ src/test/include.am | 11 +++++++++-- src/trunnel/include.am | 5 +++++ 5 files changed, 32 insertions(+), 2 deletions(-)