summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Expand)Author
2019-08-12Merge remote-tracking branch 'tor-github/pr/1077' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1065' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1056' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1034' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/987' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/952' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/951' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/937' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/926' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/911' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/848' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/741' into maint-0.3.5teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/1080' into maint-0.3.5teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/1054' into maint-0.3.5teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/920' into maint-0.3.5teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/763' into maint-0.3.5teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/1222' into combined31343_31374_035teor
2019-08-08Merge branch 'ticket31374_029' into ticket31374_035Nick Mathewson
2019-08-08Fix a warning about casting the results of GetProcAddress.Nick Mathewson
2019-08-08Merge branch 'ticket31343_029' into ticket31343_035Nick Mathewson
2019-08-08Fix another time_t/long warning for 31343.Nick Mathewson
2019-08-08Restore proper behavior of netinfo skew checkNick Mathewson
2019-08-06Merge branch 'ticket31343_029' into ticket31343_035Nick Mathewson
2019-08-06Avoid using labs() on time_t in channeltls.cNick Mathewson
2019-07-01Merge branch 'maint-0.2.9' into maint-0.3.5Nick Mathewson
2019-06-28fallback: apply the second fallback list from 2019teor
2019-06-28fallback: apply the first fallback list from 2019teor
2019-06-11Merge branch 'maint-0.2.9' into maint-0.3.5Nick Mathewson
2019-06-11Update geoip and geoip6 to the June 10 2019 database.Karsten Loesing
2019-06-11Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5teor
2019-06-11Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5teor
2019-06-10Travis: Skip test_rebind on macOS buildsteor
2019-06-06Merge branch 'bug30781_034' into bug30781_035teor
2019-06-06Merge branch 'bug30781_029' into bug30781_034teor
2019-06-06dirparse: Stop crashing when parsing unknown descriptor purpose annotationsteor
2019-06-05Bug 29034: Cleanup hs circuitmap when purpose changes.Mike Perry
2019-05-31num_bridges_usable(): only count configured bridges.Nick Mathewson
2019-05-31Consider dir info to have changed when the bridges changeNick Mathewson
2019-05-31Fix some tests for CL_PORT_NO_STREAM_OPTIONSNick Mathewson
2019-05-31Fix a logic error in deciding whether to accept SessionGroup=Nick Mathewson
2019-05-29Make get_proxy_type() connection-specificNick Mathewson
2019-05-29Merge branch 'ticket30561_029' into ticket30561_035Nick Mathewson
2019-05-29Tweak comments in tor_vasprintf(), and add a changes file for 30651Nick Mathewson
2019-05-29Fixed tor_vasprintf on systems without vasprintf.Tobias Stoeckmann
2019-05-22Merge remote-tracking branch 'nickm/ticket30454_034_01_squashed' into ticket3...David Goulet
2019-05-20hs: Remove hs_cell_onion_key_type_t enumDavid Goulet
2019-05-20trunnel: Remove INTRODUCE1 status code IN statementDavid Goulet