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

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

..

app

Merge branch 'bug26367_035_01'

2018-08-28 16:02:04 -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

Merge branch 'ticket27246_035_01_squashed'

2018-08-29 15:05:05 -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

Change mention of is_extrainfo router_parse_list_from_string() to want_extrainfo

2018-08-29 21:05:24 -04:00

lib

Fix log.c comments about assert vs tor_assert vs raw_assert.

2018-08-28 15:58:16 -04:00

rust

Merge remote-tracking branch 'teor/travis-osx-master'

2018-08-21 20:04:13 -04:00

test

Merge branch 'ticket27246_035_01_squashed'

2018-08-29 15:05:05 -04: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 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