summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-06-15Bump master to 0.3.5.0-alpha-devtor-0.3.5.0-alpha-devNick Mathewson
2018-06-14Merge branch 'maint-0.3.3'Nick Mathewson
2018-06-14Merge remote-tracking branch 'public/bug26258_033' into maint-0.3.3Nick Mathewson
2018-06-13squash! Make sure that the test_rust.sh script fails when a test failsNick Mathewson
Also make sure that we're actually running the test from within the right cwd, like we do when we're building. This seems necessary to avoid an error when running offline. Amusingly, it appears that we had this bug before: we just weren't noticing it, because of bug 26258.
2018-06-13Merge remote-tracking branch 'asn-github/bug26358'Nick Mathewson
2018-06-13Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-06-13Merge branch 'maint-0.3.3'Nick Mathewson
2018-06-13Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-06-13Fix an extra space in a changes fileNick Mathewson
2018-06-13Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-06-13Merge branch 'maint-0.3.3'Nick Mathewson
2018-06-13Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-06-13Merge branch 'bug26158_031' into maint-0.3.1Nick Mathewson
2018-06-13Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-06-13Merge branch 'maint-0.3.3'Nick Mathewson
2018-06-13Merge branch 'bug25686_diagnostic_032' into maint-0.3.2Nick Mathewson
2018-06-13Merge remote-tracking branch 'rl1987/bug24891'Nick Mathewson
2018-06-13Silence warning of relaycell/circbw tst.George Kadianakis
Shouldn't send RELAY_COMMAND_DATA cell with 0 stream id.
2018-06-12copy 0.3.3.7 changelog forward to masterNick Mathewson
2018-06-12Merge branch 'maint-0.3.3'Nick Mathewson
"ours" to avoid version bump.
2018-06-12bump to 0.3.3.7-devNick Mathewson
2018-06-12bump to 0.3.4.2-alpha-devNick Mathewson
2018-06-12Fold in changelog entry.tor-0.3.4.2-alphaNick Mathewson
2018-06-12Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-06-12Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-06-12Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-06-12Merge branch 'maint-0.3.3'Nick Mathewson
2018-06-12Merge branch 'dannenberg_ipv6_029' into maint-0.2.9Nick Mathewson
2018-06-12Add a changelog entry.Linus Nordberg
2018-06-12Add IPv6 orport address for dannenberg.Linus Nordberg
2018-06-12Merge branch 'maint-0.3.3'Nick Mathewson
"ours" merge to avoid version bump.
2018-06-12Bump to 0.3.3.7Nick Mathewson
2018-06-12Remove folded-in changes filesNick Mathewson
2018-06-12Lightly edit changelogNick Mathewson
Remove the "documentation" section, since a comment-only change doesn't usually get a changelog entry.
2018-06-12format changelog.Nick Mathewson
2018-06-12add more entries to changelogNick Mathewson
2018-06-12Merge branch 'maint-0.3.3'Nick Mathewson
2018-06-12Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-06-12Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-06-12Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1Nick Mathewson
2018-06-12Merge remote-tracking branch 'rl1987/bug26283'Nick Mathewson
2018-06-12Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-06-12Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-06-12Merge branch 'maint-0.3.3'Nick Mathewson
2018-06-12Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-06-11bump to 0.3.4.2-alphaNick Mathewson
2018-06-11start the 0.3.4.2-alpha changelogNick Mathewson
2018-06-11Several attempts to diagnose ticket 25686Nick Mathewson
There are a few reasons that relays might be uploading desciptors without saying X-Desc-Gen-Reason: 1. They are running an old version of our software, before 0.3.2.stable. 2. They are not running our software, but they are claiming they are. 3. They are uploading through a proxy that strips X-Desc-Gen-Reason. 4. They somehow had a bug in their software. According to the 25686 data, 1 is the most common reason. This ticket is an attempt to diagnose case 4, or prove that case 4 doesn't actually happen.
2018-06-11Update geoip and geoip6 to the June 7 2018 database.Karsten Loesing
2018-06-08Merge remote-tracking branch 'mikeperry-github/bug26259'Nick Mathewson