[tor-commits] [tor/master] Merge branch 'bug33673_035' into bug33673_041

[nickm at torproject.org]

commit 26fd31fef8dfbc9babf60157edf1b47b94cd49d1
Merge: 42ea03eb7 38e07b88f
Author: teor <teor at torproject.org>
Date:   Fri Mar 20 14:49:11 2020 +1000

    Merge branch 'bug33673_035' into bug33673_041
    
    Merge duplicate DLL copies from maint-0.4.1 with bug33673_035.

 .appveyor.yml    | 16 ++++++++++++++--
 changes/bug33673 |  6 ++++++
 2 files changed, 20 insertions(+), 2 deletions(-)