Nick Mathewson f8dac5c900 Merge branch 'maint-0.3.5' 7 years ago
..
app 69264f96f3 Merge branch 'dormant_persist_squashed' 7 years ago
config 2ccb9e9444 Merge branch 'maint-0.3.5' 7 years ago
core 69264f96f3 Merge branch 'dormant_persist_squashed' 7 years ago
ext 4ecd5da306 Add .may_include to ext/timeouts. 7 years ago
feature f8dac5c900 Merge branch 'maint-0.3.5' 7 years ago
lib 69264f96f3 Merge branch 'dormant_persist_squashed' 7 years ago
rust ca4b86f90a Merge remote-tracking branch 'tor-github/pr/508' 7 years ago
test 69264f96f3 Merge branch 'dormant_persist_squashed' 7 years ago
tools 0015d00842 Use tor_strdup() in place of malloc+strncpy+terminate. 7 years ago
trunnel d49baa77b5 Allow socks4_server_reply version to be 0 (for tor-resolve) 7 years ago
win32 9e48d9a920 Change version on master to 0.4.0.0-alpha-dev. 7 years ago
include.am f6b8c7da66 Move buffers.c out of lib/containers to resolve a circularity. 7 years ago