diff options
| author | teor <teor@torproject.org> | 2018-08-10 16:31:35 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-08-10 16:31:35 +1000 |
| commit | 69adc68ac6031246f9c5a723755c87d6abf34fc6 (patch) | |
| tree | 4fc194bfceab1a124cfa41057d0b510a6c2ea2ed /changes | |
| parent | 169afe3ca52fc8b201f00fe8b262c75e79a199d5 (diff) | |
| parent | e78f9c5dfb55e71fa79c152d13a1ff72fd907040 (diff) | |
| download | tor-69adc68ac6031246f9c5a723755c87d6abf34fc6.tar.gz tor-69adc68ac6031246f9c5a723755c87d6abf34fc6.zip | |
Merge branch 'travis-osx-029' into travis-osx-032
Simple merge to resolve order conflicts.
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/ticket24629 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/changes/ticket24629 b/changes/ticket24629 new file mode 100644 index 0000000000..482c0a1a6d --- /dev/null +++ b/changes/ticket24629 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Enable macOS builds in our Travis CI configuration. + Closes ticket 24629. |