commit c2e546aa23fd0de4bb75b909a5693fdd3bcbbb8d Merge: e01e4e0 027614c Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 19 15:30:23 2017 -0400

Merge remote-tracking branch 'argonblue/bug22410'

changes/bug22410 | 4 ++++ configure.ac | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+)