summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Bump RPM to 0.2.6.10rpm-tor-0.2.6.10rpm-release-0.2.6Ondrej Mikle2015-07-13
|
* Merge tag 'tor-0.2.6.10' of https://git.torproject.org/tor into ↵Ondrej Mikle2015-07-13
|\ | | | | | | rpm-release-0.2.6
| * Pick today as the release date; copy changes into ReleaseNotestor-0.2.6.10Nick Mathewson2015-07-12
| |
| * Re-run format_changelogNick Mathewson2015-07-12
| |
| * Arma moved a paren into a better, but not grammatical, place. Fix that.Nick Mathewson2015-07-12
| | | | | | | | | | | | | | According to all the usage guides I have, parentheses should contain the close-of-sentence punctuation only when the whole sentence is in parentheses. So you would write this sentence like this (because it's correct). (Does that make sense?)
| * tiny changelog updatesRoger Dingledine2015-07-12
| | | | | | | | the only substantive one was moving a paren around in the #16381 entry.
| * Edit changelogNick Mathewson2015-07-12
| |
| * Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson2015-07-12
| |\
| | * Bump maint-0.2.6 to 0.2.6.10Nick Mathewson2015-07-12
| | |
| * | Finish one of my classic sentences where I had omitted anNick Mathewson2015-07-12
| | |
| * | Collate and format entries for changelog for 0.2.6.10Nick Mathewson2015-07-12
| | | | | | | | | | | | More editing needed.
| * | Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson2015-07-10
| |\ \ | | |/
| | * Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson2015-06-25
| | |\
| | | * Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson2015-06-25
| | | |\
| | | | * Merge remote-tracking branch 'karsten/geoip6-jun2015' into maint-0.2.4Nick Mathewson2015-06-25
| | | | |\
| | | | | * Update geoip6 to the June 3 2015 database.Karsten Loesing2015-06-09
| | | | | |
| | | | * | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2015-06-25
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * Update geoip to the June 3 2015 database.Karsten Loesing2015-06-09
| | | | | |
| * | | | | Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson2015-06-25
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge remote-tracking branch 'public/bug16013_025' into maint-0.2.6Nick Mathewson2015-06-25
| | |\ \ \ \
| | | * | | | Avoid crashing on busy/NEWNYM+hidden service clientsNick Mathewson2015-06-25
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we ran out of intro points for a hidden service (which could happen on a newnym), we would change the connection's state back to "waiting for hidden service descriptor." But this would make an assertion fail if we went on to call circuit_get_open_circ_or_launch again. This fixes bug 16013; I believe the bug was introduced in 38be533c69417aacf28cedec1c3bae808ce29f4, where we made it possible for circuit_get_open_circ_or_launch() to change the connection's state.
| | * | | | Merge remote-tracking branch 'public/bug16400_026' into maint-0.2.6Nick Mathewson2015-06-25
| | |\ \ \ \
| | | * | | | Repair breakage in early-error case of microdesc parsingNick Mathewson2015-06-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When I fixed #11243, I made it so we would take the digest of a descriptor before tokenizing it, so we could desist from download attempts if parsing failed. But when I did that, I didn't remove an assertion that the descriptor began with "onion-key". Usually, this was enforced by "find_start_of_next_microdescriptor", but when find_start_of_next_microdescriptor returned NULL, the assertion was triggered. Fixes bug 16400. Thanks to torkeln for reporting and cypherpunks_backup for diagnosing and writing the first fix here.
| | * | | | | Merge remote-tracking branch 'dgoulet/bug16381_026_01-revert' into maint-0.2.6Nick Mathewson2015-06-18
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Revert "Do not replace a HS descriptor with a different replica of itself"David Goulet2015-06-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9407040c592184e05e45a3c1a00739c2dd302288. Small fix, "e->received" had to be removed since that variable doesn't exist anymore. Signed-off-by: David Goulet <dgoulet@ev0ke.net>
| | * | | | | Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson2015-06-17
| | |\ \ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / /
| | | * | | Correctly handle failed crypto_early_initteor2015-06-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If crypto_early_init fails, a typo in a return value from tor_init means that tor_main continues running, rather than returning an error value. Fixes bug 16360; bugfix on d3fb846d8c98 in 0.2.5.2-alpha, introduced when implementing #4900. Patch by "teor".
| | * | | | Fix another seccomp2 issueNick Mathewson2015-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow pipe() and pipe2() syscalls; we need these when eventfd2() support is missing. Fixes bug 16363; bugfix on 0.2.6.3-alpha. Patch from "teor".
* | | | | | Bump RPM to 0.2.6.9rpm-tor-0.2.6.9Ondrej Mikle2015-06-12
| | | | | |
* | | | | | Merge tag 'tor-0.2.6.9' of https://git.torproject.org/tor into rpm-release-0.2.6Ondrej Mikle2015-06-12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Spell occurred righttor-0.2.6.9Nick Mathewson2015-06-10
| | | | | |
| * | | | | Pick a date; copy changelog to release notesNick Mathewson2015-06-10
| | | | | |
| * | | | | Merge branch 'maint-0.2.6' into release-0.2.6Andrea Shepard2015-06-10
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bump version to 0.2.6.9Andrea Shepard2015-06-10
| | | | | |
| * | | | | Merge branch 'release-0.2.6' of ssh://git-rw.torproject.org/tor into ↵Andrea Shepard2015-06-10
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | release-0.2.6
| | * | | | | Yawning found a typoNick Mathewson2015-06-10
| | | | | | |
| * | | | | | Bump version to 0.2.6.9Andrea Shepard2015-06-10
| |/ / / / /
| * | | | | Try writing a blurbNick Mathewson2015-06-10
| | | | | |
| * | | | | edit 0.2.6 changelog entriesNick Mathewson2015-06-10
| | | | | |
| * | | | | Fix typo in 0.2.6.9 ChangeLogAndrea Shepard2015-06-10
| | | | | |
| * | | | | Start changelog for 0.2.6.9 (lintchanges, sortchanges, formatchangelog).Nick Mathewson2015-06-08
| | | | | |
| * | | | | Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson2015-06-08
| |\ \ \ \ \ | | |/ / / /
| | * | | | HSDir flag now requires the Stable flagDavid Goulet2015-06-08
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #8243
| | * | | | Set session_group after the port's data structure has been populated.Yawning Angel2015-06-04
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #16247, patch by "jojelino".
| | * | | | Fix sandboxing to work when running as a relayPeter Palfrader2015-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes correctly allowing renaming secret_id_key and allowing the eventfd2 and futex syscalls. Fixes bug 16244; bugfix on 0.2.6.1-alpha.
| | * | | | Fix sandbox use with systemd. bug 16212.Nick Mathewson2015-05-28
| | | | | |
| | * | | | Fix unit tests on MSVC2013.Nick Mathewson2015-05-26
| | | | | | | | | | | | | | | | | | | | | | | | Patch from "NewEraCracker." Fixes bug16030; bugfix on 0.2.6.2-alpha.
| | * | | | Fix --enable-systemd builds on systems with libsystemd but not systemdNick Mathewson2015-05-26
| | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 16164; bugfix on 0.2.6.3-alpha. Patch from Peter Palfrader.
| * | | | | ChangeLog->releasenotesNick Mathewson2015-05-21
| | | | | |
| * | | | | whoops, note the release dateNick Mathewson2015-05-21
| | | | | |