[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' of https://git.torproject.org/tor into maint-0.3.2

commit 9c83cd1993b6ed98301020e5a170df9d5427a1e6 Merge: 6fed66d26 5a8827a4c Author: David Goulet Date: Tue Sep 11 15:36:48 2018 -0400 Merge branch 'maint-0.3.2' of https://git.torproject.org/tor into maint-0.3.2 .travis.yml | 267 +- Makefile.am

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' of https://git.torproject.org/tor into maint-0.3.2

commit d1a6043bfb0a3869439565d563a93aeb0fa30923 Merge: 9c83cd199 0971b3ce4 Author: David Goulet Date: Thu Sep 20 10:59:23 2018 -0400 Merge branch 'maint-0.3.2' of https://git.torproject.org/tor into maint-0.3.2 changes/bug27335| 4 changes/bug27658| 6 ++