Nick Mathewson fd994f55c4 Merge remote-tracking branch 'rl1987/doc26908' 5 éve
..
app 3507fead10 Merge branch 'tor_api_owning_control' 5 éve
config ce4f73f8a3 Update sample torrc files to warn about not using BridgeRelay and MyFamily together 5 éve
core 3507fead10 Merge branch 'tor_api_owning_control' 5 éve
ext 46501cdd18 Fix forking tests on Windows when there is a space in the path. 6 éve
feature 1e71e2c104 c99 style in loop 5 éve
lib 3507fead10 Merge branch 'tor_api_owning_control' 5 éve
rust bf5704051c Merge remote-tracking branch 'teor/travis-osx-master' 5 éve
test 3507fead10 Merge branch 'tor_api_owning_control' 5 éve
tools 3507fead10 Merge branch 'tor_api_owning_control' 5 éve
trunnel 7556933537 Merge branch 'socks_trunnel4_squashed' into socks_trunnel4_squashed_merged 6 éve
win32 e22822e4ae Bump master to 0.3.5.0-alpha-dev 6 éve
include.am 81cb0afb2b Start splitting src/or 6 éve