commit 4a15b3169645a397fc8193f91737604538ac077e Merge: c0559b9 90dd7dc Author: Nick Mathewson nickm@torproject.org Date: Tue May 30 13:33:49 2017 -0400

Merge remote-tracking branch 'argonblue/bug22413'

changes/bug22413 | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)