summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-09-18Merge branch 'maint-0.3.1' into release-0.3.1tor-0.3.1.7Nick Mathewson
2017-09-18Make hs_ntor_ref.py work with python3Nick Mathewson
2017-09-18Finish changelog and release notes for 0.3.1.7Nick Mathewson
2017-09-18Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-09-18Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-09-18Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-09-18Merge branch 'trove-2017-008_030' into maint-0.3.0Nick Mathewson
2017-09-18Merge branch 'maint-0.2.8' into maint-0.3.0Nick Mathewson
This is an "ours" merge to avoid the conflict from the 0.2.8 version of the fix for TROVE-2017-008.
2017-09-18Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-09-18Merge branch 'trove-2017-008_028' into maint-0.2.8Nick Mathewson
2017-09-18Fix log-uninitialized-stack bug in rend_service_intro_established.Nick Mathewson
Fixes bug 23490; bugfix on 0.2.7.2-alpha. TROVE-2017-008 CVE-2017-0380
2017-09-18Fix log-uninitialized-stack bug in rend_service_intro_established.Nick Mathewson
Fixes bug 23490; bugfix on 0.2.7.2-alpha. TROVE-2017-008 CVE-2017-0380
2017-09-15Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-09-15Merge branch 'bug23533_031' into maint-0.3.1Nick Mathewson
2017-09-15Fix several places where md-using relays would get wrong behavior.Nick Mathewson
This patch replaces a few calls to router_get_by_id_digest ("do we have a routerinfo?") with connection_or_digest_is_known_relay ("do we know this relay to be in the consensus, or have been there some time recently?"). Found while doing the 21585 audit; fixes bug 23533. Bugfix on 0.3.0.1-alpha.
2017-09-15Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-09-15bump to 0.3.1.7Nick Mathewson
2017-09-14Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-09-14Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
"ours" merge to avoid version bump.
2017-09-14Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
"ours" merge to avoid version bump.
2017-09-14Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
"ours" merge to avoid version bump.
2017-09-14version bump: 0.3.0.11Nick Mathewson
2017-09-14version bump: 0.2.9.12Nick Mathewson
2017-09-14version bump: 0.2.8.15Nick Mathewson
2017-09-14Combine sections in the 0.3.1.7 releasenotesNick Mathewson
2017-09-14Remove bugfix-on-0.3.1.x entries from 0.3.1.7 releasenotesNick Mathewson
2017-09-14First attempt at ReleaseNotes for 0.3.1.7Nick Mathewson
Entries are sorted, but not wrapped or pruned.
2017-09-14very light editsNick Mathewson
2017-09-14Start a changelog for 0.3.1.7Nick Mathewson
2017-09-14Appease lintChangesNick Mathewson
2017-09-14Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-09-14Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-09-14entrynodes.c: fix syntax error around BUG() statementMartin Kepplinger
Fix those misplaced brackets. Signed-off-by: Martin Kepplinger <martink@posteo.de>
2017-09-14Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-09-14Merge remote-tracking branch 'mikeperry/bug23077' into maint-0.3.1Nick Mathewson
2017-09-14Bug 23077: Make channelpadding tests use mocked time.Mike Perry
2017-09-12Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-09-12Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-09-12Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-09-12Merge branch 'bug15582_029' into maint-0.2.9Nick Mathewson
2017-09-12Avoid sscanf() warnings from openbsd in the unit testsNick Mathewson
OpenBSD doesn't like tricks where you use a too-wide sscanf argument for a too-narrow array, even when you know the input string statically. The fix here is just to use bigger buffers. Fixes 15582; bugfix on a3dafd3f58bb312 in 0.2.6.2-alpha.
2017-09-12Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-09-12Merge branch 'ticket17857_squashed' into maint-0.3.1Nick Mathewson
2017-09-12Changes file for #17857.Mike Perry
2017-09-12Ticket #17857: Apply padding off-switch to existing connections.Mike Perry
2017-09-12Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-09-12Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
"ours" merge to avoid torgzip.c change, since torgzip has been replaced.
2017-09-12Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-09-12One more implicit fallthrough warning to fix on GCC 7Nick Mathewson
2017-09-11Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson