commit 49c696fb4683c46be8e957900b6a95f95e422a4e Merge: e57209dc3 394528241 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 1 13:48:58 2019 -0400

Merge branch 'ticket31311_041' into ticket31304

Makefile.am | 9 ++++++--- changes/ticket31311 | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-)