diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-07 11:17:32 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-07 11:17:32 -0500 |
| commit | 3eeb7c6e26d4e43873a01da6e3926ca33baf54dc (patch) | |
| tree | 1d8c22164516b1038919f8c8e4730a3ab2f72d15 | |
| parent | 6e828ced56c04aa38fa6e2d595528bf0d046ca8c (diff) | |
| parent | aea2b0446785b76d09bb1a615acc2d0976a87c0d (diff) | |
| download | tor-3eeb7c6e26d4e43873a01da6e3926ca33baf54dc.tar.gz tor-3eeb7c6e26d4e43873a01da6e3926ca33baf54dc.zip | |
Merge branch 'maint-0.3.5'
| -rw-r--r-- | .appveyor.yml | 6 | ||||
| -rw-r--r-- | changes/ticket28318 | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 7d8927ee35..c8db2505f2 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,6 +2,12 @@ version: 1.0.{build} clone_depth: 50 +image: + # Windows Server 2012 R2 + - Visual Studio 2015 + # Windows Server 2016 + - Visual Studio 2017 + environment: compiler: mingw diff --git a/changes/ticket28318 b/changes/ticket28318 new file mode 100644 index 0000000000..24dc1e9580 --- /dev/null +++ b/changes/ticket28318 @@ -0,0 +1,3 @@ + o Minor features (Windows, continuous integration): + - Build tor on Windows Server 2012 R2 and Windows Server 2016 using + Appveyor's CI. Closes ticket 28318. |