summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-07-12Pick today as the release date; copy changes into ReleaseNotestor-0.2.6.10Nick Mathewson
2015-07-12Re-run format_changelogNick Mathewson
2015-07-12Arma moved a paren into a better, but not grammatical, place. Fix that.Nick Mathewson
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?)
2015-07-12tiny changelog updatesRoger Dingledine
the only substantive one was moving a paren around in the #16381 entry.
2015-07-12Edit changelogNick Mathewson
2015-07-12Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson
2015-07-12Bump maint-0.2.6 to 0.2.6.10Nick Mathewson
2015-07-12Finish one of my classic sentences where I had omitted anNick Mathewson
2015-07-12Collate and format entries for changelog for 0.2.6.10Nick Mathewson
More editing needed.
2015-07-10Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson
2015-06-25Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson
2015-06-25Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-06-25Merge remote-tracking branch 'karsten/geoip6-jun2015' into maint-0.2.4Nick Mathewson
2015-06-25Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2015-06-25Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson
2015-06-25Merge remote-tracking branch 'public/bug16013_025' into maint-0.2.6Nick Mathewson
2015-06-25Avoid crashing on busy/NEWNYM+hidden service clientsNick Mathewson
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.
2015-06-25Merge remote-tracking branch 'public/bug16400_026' into maint-0.2.6Nick Mathewson
2015-06-22Repair breakage in early-error case of microdesc parsingNick Mathewson
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.
2015-06-18Merge remote-tracking branch 'dgoulet/bug16381_026_01-revert' into maint-0.2.6Nick Mathewson
2015-06-17Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson
2015-06-17Correctly handle failed crypto_early_initteor
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".
2015-06-16Revert "Do not replace a HS descriptor with a different replica of itself"David Goulet
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>
2015-06-15Fix another seccomp2 issueNick Mathewson
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".
2015-06-10Spell occurred righttor-0.2.6.9Nick Mathewson
2015-06-10Pick a date; copy changelog to release notesNick Mathewson
2015-06-10Merge branch 'maint-0.2.6' into release-0.2.6Andrea Shepard
2015-06-10Bump version to 0.2.6.9Andrea Shepard
2015-06-10Merge branch 'release-0.2.6' of ssh://git-rw.torproject.org/tor into ↵Andrea Shepard
release-0.2.6
2015-06-10Bump version to 0.2.6.9Andrea Shepard
2015-06-10Yawning found a typoNick Mathewson
2015-06-10Try writing a blurbNick Mathewson
2015-06-10edit 0.2.6 changelog entriesNick Mathewson
2015-06-10Fix typo in 0.2.6.9 ChangeLogAndrea Shepard
2015-06-09Update geoip6 to the June 3 2015 database.Karsten Loesing
2015-06-09Update geoip to the June 3 2015 database.maint-0.2.3Karsten Loesing
2015-06-08Start changelog for 0.2.6.9 (lintchanges, sortchanges, formatchangelog).Nick Mathewson
2015-06-08Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson
2015-06-08HSDir flag now requires the Stable flagDavid Goulet
Fixes #8243
2015-06-04Set session_group after the port's data structure has been populated.Yawning Angel
Fixes #16247, patch by "jojelino".
2015-06-02Fix sandboxing to work when running as a relayPeter Palfrader
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.
2015-05-28Fix sandbox use with systemd. bug 16212.Nick Mathewson
2015-05-26Fix unit tests on MSVC2013.Nick Mathewson
Patch from "NewEraCracker." Fixes bug16030; bugfix on 0.2.6.2-alpha.
2015-05-26Fix --enable-systemd builds on systems with libsystemd but not systemdNick Mathewson
Fixes bug 16164; bugfix on 0.2.6.3-alpha. Patch from Peter Palfrader.
2015-05-21ChangeLog->releasenotesNick Mathewson
2015-05-21whoops, note the release dateNick Mathewson
2015-05-19add backport notes to changelogtor-0.2.6.8Nick Mathewson
2015-05-19Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson
Conflicts: configure.ac contrib/win32build/tor-mingw.nsi.in src/win32/orconfig.h
2015-05-19Bump maint-0.2.6 to 0.2.6.8Nick Mathewson
2015-05-19Start a changelog for 0.2.6.8Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion