commit debe846cb88c1157c1820c88a7128dd2362335d3 Merge: bbac9e1 b822c58 Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 31 10:58:41 2016 -0400

Merge remote-tracking branch 'teor/bug19905'

Makefile.am | 4 ++-- changes/bug19905 | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-)