[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3

[nickm@xxxxxxxxxxxxxx]

commit cf1f5c68b94d567f3da4ab733299d07e36b3b8d3
Merge: 5ceb60e5c c0dd2a6e3
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri May 15 09:02:49 2020 -0400

    Merge branch 'maint-0.4.3' into release-0.4.3

 configure.ac                        | 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits