Nick Mathewson 0d9dc13e08 Merge remote-tracking branch 'tor-github/pr/544' 7 lat temu
..
app 2b2b97484a Merge branch 'ticket27490a_squashed' 7 lat temu
config e27dff08a3 Merge branch 'maint-0.3.5' 7 lat temu
core 0d9dc13e08 Merge remote-tracking branch 'tor-github/pr/544' 7 lat temu
ext d44eb16b23 Merge branch 'maint-0.3.4' 7 lat temu
feature 8221b5d587 Merge remote-tracking branch 'tor-github/pr/559' 7 lat temu
lib 701eaef980 Move net.inet.ip.random_id code to lib/net/ 7 lat temu
rust 31cc0d2c0b Merge branch 'maint-0.3.5' 7 lat temu
test 2b2b97484a Merge branch 'ticket27490a_squashed' 7 lat temu
tools 0015d00842 Use tor_strdup() in place of malloc+strncpy+terminate. 7 lat temu
trunnel d49baa77b5 Allow socks4_server_reply version to be 0 (for tor-resolve) 7 lat temu
win32 9e48d9a920 Change version on master to 0.4.0.0-alpha-dev. 7 lat temu
include.am 6e7ff8cba0 Move the code that knows our tor version into a lowest-level lib 7 lat temu