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

[nickm@xxxxxxxxxxxxxx]

commit 63b84335dc590499e5f22498383d6a3432e91ec4
Merge: afacaa02a 1a7779966
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Dec 21 12:42:22 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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

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