nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-03 17:13:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,105 Commits 53 Branches 630 Tags 128 MiB
4bae17e57d
Commit Graph

20105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson
4bae17e57d Edit changelog 2015-07-12 14:07:00 -04:00
Nick Mathewson
3085343783 Merge branch 'maint-0.2.6' into release-0.2.6 2015-07-12 13:33:52 -04:00
Nick Mathewson
3d0c09019f Bump maint-0.2.6 to 0.2.6.10 2015-07-12 13:33:47 -04:00
Nick Mathewson
aff40531cb Finish one of my classic sentences where I had omitted an 2015-07-12 13:30:19 -04:00
Nick Mathewson
e02a643009 Collate and format entries for changelog for 0.2.6.10 
More editing needed.
 2015-07-12 13:29:06 -04:00
Nick Mathewson
2cdef2bb34 Merge branch 'maint-0.2.6' into release-0.2.6 2015-07-10 11:54:49 -04:00
Nick Mathewson
418b6f8197 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 2015-06-25 11:43:17 -04:00
Nick Mathewson
fd082c394b Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 2015-06-25 11:43:04 -04:00
Nick Mathewson
fde4199e1c Merge remote-tracking branch 'karsten/geoip6-jun2015' into maint-0.2.4 2015-06-25 11:42:47 -04:00
Nick Mathewson
cb8c5c023f Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2015-06-25 11:42:31 -04:00
Nick Mathewson
23a95986ce Merge branch 'maint-0.2.6' into release-0.2.6 2015-06-25 11:20:11 -04:00
Nick Mathewson
1c1d71fe1a Merge remote-tracking branch 'public/bug16013_025' into maint-0.2.6 2015-06-25 11:14:44 -04:00
Nick Mathewson
68eaaed798 Avoid crashing on busy/NEWNYM+hidden service clients 
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
38be533c69, where we made it possible for
circuit_get_open_circ_or_launch() to change the connection's state.
 2015-06-25 11:10:43 -04:00
Nick Mathewson
03e3cf6a7a Merge remote-tracking branch 'public/bug16400_026' into maint-0.2.6 2015-06-25 10:40:58 -04:00
Nick Mathewson
e0b7598833 Repair breakage in early-error case of microdesc parsing 
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-22 13:51:56 -04:00
Nick Mathewson
f18ee7fc72 Merge remote-tracking branch 'dgoulet/bug16381_026_01-revert' into maint-0.2.6 2015-06-18 11:30:01 -04:00
Nick Mathewson
c8cb55659a Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 2015-06-17 09:18:45 -04:00
teor
75388f67c0 Correctly handle failed crypto_early_init 
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 d3fb846d8c in 0.2.5.2-alpha,
introduced when implementing #4900.

Patch by "teor".
 2015-06-17 09:18:32 -04:00
David Goulet
8acf5255c2 Revert "Do not replace a HS descriptor with a different replica of itself" 
This reverts commit 9407040c59.

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-16 13:41:42 -04:00
Nick Mathewson
59fa0c2d99 Fix another seccomp2 issue 
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-15 10:13:11 -04:00
Nick Mathewson
d41ab97294 Spell occurred right 2015-06-10 14:09:26 -04:00
Nick Mathewson
5bf688ee0f Pick a date; copy changelog to release notes 2015-06-10 13:56:48 -04:00
Andrea Shepard
0e939c1e00 Merge branch 'maint-0.2.6' into release-0.2.6 2015-06-10 15:03:22 +00:00
Andrea Shepard
1eb2c0cbd3 Bump version to 0.2.6.9 2015-06-10 15:02:04 +00:00
Andrea Shepard
2f17b91ae2 Merge branch 'release-0.2.6' of ssh://git-rw.torproject.org/tor into release-0.2.6 2015-06-10 14:59:13 +00:00
Andrea Shepard
b616aea074 Bump version to 0.2.6.9 2015-06-10 14:58:33 +00:00
Nick Mathewson
376171104c Yawning found a typo 2015-06-10 10:52:58 -04:00
Nick Mathewson
e8758dba8f Try writing a blurb 2015-06-10 10:50:15 -04:00
Nick Mathewson
f591ce17e8 edit 0.2.6 changelog entries 2015-06-10 10:46:26 -04:00
Andrea Shepard
5dc6f758d6 Fix typo in 0.2.6.9 ChangeLog 2015-06-10 14:43:31 +00:00
Karsten Loesing
08e14e1448 Update geoip6 to the June 3 2015 database. 2015-06-09 16:28:48 +02:00
Karsten Loesing
e5907e94c2 Update geoip to the June 3 2015 database. 2015-06-09 16:26:10 +02:00
Nick Mathewson
41db4bffd6 Start changelog for 0.2.6.9 (lintchanges, sortchanges, formatchangelog). 2015-06-08 10:50:54 -04:00
Nick Mathewson
602e328dc3 Merge branch 'maint-0.2.6' into release-0.2.6 2015-06-08 10:42:25 -04:00
David Goulet
6785f0b65a HSDir flag now requires the Stable flag 
Fixes #8243
 2015-06-08 10:28:35 -04:00
Yawning Angel
f2ff814582 Set session_group after the port's data structure has been populated. 
Fixes #16247, patch by "jojelino".
 2015-06-04 13:53:35 +00:00
Peter Palfrader
a68e5323f8 Fix sandboxing to work when running as a relay 
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-06-02 14:20:01 -04:00
Nick Mathewson
97330ced0c Fix sandbox use with systemd. bug 16212. 2015-05-28 14:05:46 -04:00
Nick Mathewson
8ca3773f68 Fix unit tests on MSVC2013. 
Patch from "NewEraCracker."  Fixes bug16030; bugfix on 0.2.6.2-alpha.
 2015-05-26 10:34:07 -04:00
Nick Mathewson
08e8c21b1f Fix --enable-systemd builds on systems with libsystemd but not systemd 
Fixes bug 16164; bugfix on 0.2.6.3-alpha. Patch from Peter Palfrader.
 2015-05-26 09:39:53 -04:00
Nick Mathewson
2fe3afccb6 ChangeLog->releasenotes 2015-05-21 10:42:03 -04:00
Nick Mathewson
2a38a3f92b whoops, note the release date 2015-05-21 10:40:33 -04:00
Nick Mathewson
5c8440b13b add backport notes to changelog 2015-05-19 14:59:27 -04:00
Nick Mathewson
a45526c230 Merge branch 'maint-0.2.6' into release-0.2.6 
Conflicts:
	configure.ac
	contrib/win32build/tor-mingw.nsi.in
	src/win32/orconfig.h
 2015-05-19 14:49:54 -04:00
Nick Mathewson
b3a225fb13 Bump maint-0.2.6 to 0.2.6.8 2015-05-19 14:48:09 -04:00
Nick Mathewson
e1366d907a Start a changelog for 0.2.6.8 2015-05-19 14:41:17 -04:00
Nick Mathewson
dad3522712 Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6 2015-05-13 11:05:50 -04:00
Nick Mathewson
614d9bc967 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 2015-05-13 11:05:33 -04:00
Nick Mathewson
407441c652 Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6 2015-05-13 11:05:05 -04:00
Nick Mathewson
8aa04408fb Merge branch 'bug15823_025' into maint-0.2.5 2015-05-13 11:03:05 -04:00