Nick Mathewson bedc0b0b8f Merge branch 'maint-0.3.4'

2018-08-17 09:29:46 -04:00

..

app

Merge remote-tracking branch 'juga/ticket3723_03_squashed_rebased'

2018-07-30 08:33:59 -04:00

config

Merge branch 'maint-0.3.3' into maint-0.3.4

2018-08-09 08:47:25 -04:00

core

Merge remote-tracking branch 'tor-github/pr/244'

2018-08-11 10:05: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

In addrs_in_same_network_family(), choose IP subnet size based on IP type

2018-08-17 13:37:51 +10:00

lib

Merge branch 'bug26779_033' into bug26779_035

2018-08-08 15:50:29 -04:00

rust

Merge branch 'maint-0.3.4'

2018-08-17 09:29:46 -04:00

test

In addrs_in_same_network_family(), choose IP subnet size based on IP type

2018-08-17 13:37:51 +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