summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-08tor 0.2.6.12 changelogtor-0.2.6.12Nick Mathewson
2017-06-08Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson
2017-06-08Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
"ours" merge to avoid version bump.
2017-06-08Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
"ours" merge to avoid version bump.
2017-06-08Bump to 0.2.6.12Nick Mathewson
2017-06-08bump to 0.2.5.14Nick Mathewson
2017-06-08Bump to 0.2.4.29Nick Mathewson
2017-06-08Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson
2017-06-08Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-06-08Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-06-08TROVE-2017-005: Fix assertion failure in connection_edge_process_relay_cellDavid Goulet
On an hidden service rendezvous circuit, a BEGIN_DIR could be sent (maliciously) which would trigger a tor_assert() because connection_edge_process_relay_cell() thought that the circuit is an or_circuit_t but is an origin circuit in reality. Fixes #22494 Reported-by: Roger Dingledine <arma@torproject.org> Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-06-05Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson
2017-06-05Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
Ours merge to avoid taking 4ee48cb434c46d9e4c477dabd8a97f03e3db221d
2017-06-05Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-06-05Fix C89 warning (since Tor 0.2.4-5 still care about that.)Nick Mathewson
2017-06-05Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson
2017-06-05Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-06-05Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-06-05Fix undefined behavior in geoip_parse_entry().Nick Mathewson
Fixes bug 22490; bugfix on 6a241ff3ffe7dc1 in 0.2.4.6-alpha. Found by teor using clang-5.0's AddressSanitizer stack-use-after-scope.
2017-05-08Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson
2017-05-08Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-05-08Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-05-08Update geoip and geoip6 to the May 2 2017 database.Karsten Loesing
2017-04-06Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson
2017-04-06Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-04-06Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-04-06Update geoip and geoip6 to the April 4 2017 database.Karsten Loesing
2017-03-08Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson
2017-03-08Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-03-08Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-03-08Update geoip and geoip6 to the March 7 2017 database.Karsten Loesing
2017-03-03Pick a date, update ReleaseNotes. (0.2.6)tor-0.2.6.11Nick Mathewson
2017-02-28Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson
2017-02-28bump to 0.2.6.11Nick Mathewson
2017-02-28Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
"ours" merge to avoid version bumps
2017-02-28Bump version to 0.2.5.13Nick Mathewson
2017-02-28Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
"ours" merge to avoid bumping version
2017-02-28Bump to 0.2.4.28Nick Mathewson
2017-02-28Sort changelog in release-0.2.6Nick Mathewson
2017-02-28Adjust 0.2.6.11 changelog entry from 0.3.0.4-rc to matchNick Mathewson
2017-02-23Fix description of 026 EOLNick Mathewson
2017-02-23Begin an 0.2.6.11 changelogNick Mathewson
To build this changelog, I've gone through the entries in release-0.2.6's changes subdirectory, and looked up the ChangeLog entry for each. I have not sorted them yet.
2017-02-15Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson
2017-02-15Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-02-15Merge branch 'maint-0.2.6' of git-rw.torproject.org:/tor into maint-0.2.6Nick Mathewson
2017-02-15Merge branch 'maint-0.2.5' of git-rw.torproject.org:/tor into maint-0.2.5Nick Mathewson
2017-02-15Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson
2017-02-15Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-02-15Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-02-14Avoid integer underflow in tor_version_compare.Nick Mathewson
Fix for TROVE-2017-001 and bug 21278. (Note: Instead of handling signed ints "correctly", we keep the old behavior, except for the part where we would crash with -ftrapv.)