[tor-commits] [tor/maint-0.3.4] Merge branch 'travis-osx-033' into travis-osx-034

[nickm at torproject.org]

commit a1c110a2a478d3fae50871741d52659cc34f4623
Merge: 2a33edc59 ed1210d0f
Author: teor <teor at torproject.org>
Date:   Fri Aug 10 16:41:27 2018 +1000

    Merge branch 'travis-osx-033' into travis-osx-034
    
    Take the asciidoc changes from 033, and the module changes from
    034.

 .travis.yml | 1 +
 1 file changed, 1 insertion(+)