teor ace98493bd Merge branch 'travis-osx-034' into travis-osx-master ... Replace master .travis.yml with 034 .travis.yml. All the changes in master have been backported to the 034 .travis.yml already. Replace master src/test/test_rust.sh with 034 src/test/test_rust.sh, which was backported from master. One 033/034-specific commit needs to be reverted.		2018-08-10 13:28:19 +10:00
..
app	Merge remote-tracking branch 'juga/ticket3723_03_squashed_rebased'	2018-07-30 08:33:59 -04:00
config	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-07-09 09:11:41 -04:00
core	Merge branch 'maint-0.3.4'	2018-08-08 18:06:15 -04:00
ext	Fix forking tests on Windows when there is a space in the path.	2018-07-13 12:46:18 +02:00
feature	Provide examples of tor_api_get_provider_version() output	2018-08-08 18:10:28 -04:00
lib	Merge branch 'maint-0.3.4'	2018-08-08 09:26:23 -04:00
rust	Merge branch 'travis-osx-034' into travis-osx-master	2018-08-10 13:28:19 +10:00
test	Merge branch 'travis-osx-034' into travis-osx-master	2018-08-10 13:28:19 +10:00
tools	Add a new function, tor_api_get_provider_version()	2018-07-31 09:18:54 -04:00
trunnel	Merge branch 'socks_trunnel4_squashed' into socks_trunnel4_squashed_merged	2018-07-12 11:47:25 -04:00
win32	Update version to 0.3.4.6-rc-dev	2018-08-07 20:15:34 -04:00
include.am	Start splitting src/or	2018-07-05 17:15:50 -04:00