commit 6b136c18e1db40aaca7e7c32436989abf767a5c0 Merge: 438b7eec8 e218da172 Author: teor <teor@torproject.org> Date: Fri Jun 14 11:49:02 2019 +1000 Merge branch 'bug30455_041' into bug30455_master Makefile.am | 19 +++++++++++-------- changes/bug30455 | 5 +++++ 2 files changed, 16 insertions(+), 8 deletions(-)