[tor-commits] [tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1271' into maint-0.3.5

[teor at torproject.org]

commit 04618371497bd5040d3af3e6fd782c361a7ba3a5
Merge: 1132dc9f7 664d1b436
Author: teor <teor at torproject.org>
Date:   Thu Sep 5 14:47:34 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1271' into maint-0.3.5

 Makefile.am         | 2 +-
 changes/ticket31554 | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)