Nick Mathewson 7e91eb83d8 Merge branch 'maint-0.3.4'

2018-09-07 08:45:10 -04:00

..

app

Merge branch 'nss_squashed' into nss_merge

2018-09-04 20:21:07 -04:00

config

Update sample torrc files to warn about not using BridgeRelay and MyFamily together

2018-09-02 21:11:52 +03:00

core

Revert "Avoid double-close on TCP sockets under NSS."

2018-09-06 11:06:30 -04:00

ext

Update prefork and postfork NSS code for unit tests.

2018-09-04 14:52:35 -04:00

feature

Merge branch 'maint-0.3.4'

2018-09-07 08:45:10 -04:00

lib

Revert "Avoid double-close on TCP sockets under NSS."

2018-09-06 11:06:30 -04:00

rust

Merge branch 'nss_squashed' into nss_merge

2018-09-04 20:21:07 -04:00

test

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

2018-09-06 09:47:32 -04:00

tools

Merge branch 'nss_squashed' into nss_merge

2018-09-04 20:21:07 -04:00

trunnel

Merge branch 'socks_trunnel4_squashed' into socks_trunnel4_squashed_merged

2018-07-12 11:47:25 -04:00

win32

Update to 0.3.4.7-rc-dev

2018-08-24 16:49:56 -04:00

include.am

Start splitting src/or

2018-07-05 17:15:50 -04:00