torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
18,785 Commits 53 Branches 631 Tags
b2acd3580c8c129771cdcc1f0ab2bbfcaffbdefb
Commit Graph

2957 Commits

Author SHA1 Message Date
Nick Mathewson fdb7fc70d0 Merge remote-tracking branch 'public/bug10163' 2014-08-26 09:44:16 -04:00
Nick Mathewson 59e114832e Merge branch 'bug11792_1_squashed' 
Conflicts:
	src/or/circuitlist.c
 2014-08-24 13:09:08 -04:00
Nick Mathewson 68e430a6fb Kill non-tunneled directory connections when handling OOM. 
Another part of 11792.
 2014-08-24 13:04:38 -04:00
Nick Mathewson 8e55cafd67 Count zlib buffer memory towards OOM totals. 
Part of 11792.

(Uses the zlib-endorsed formula for memory needs for inflate/deflate
from "zconf.h".)
 2014-08-24 13:04:27 -04:00
Nick Mathewson 446e481c90 Check for duplicate arguments to tor-gencert 
Found by coverity, which noticed that if you said
  tor-gencert -i identity1 -i identity2
we would leak "identity1".

[CID 1198201, 1198202, 1198203]
 2014-08-21 11:22:42 -04:00
Nick Mathewson 916fba2243 Merge branch 'bug12205_take2_squashed' 2014-08-20 15:32:48 -04:00
rl1987 197d855009 Rewriting entry_is_time_to_retry() using table approach. 2014-08-20 15:29:55 -04:00
Nick Mathewson 01a0ab02a3 Merge branch 'bug10116_squashed' 2014-08-20 14:52:24 -04:00
Nick Mathewson 7f5a440421 Don't allocate an extra smartlist in the OOM handler 
Fixes issue 10116
 2014-08-20 14:50:38 -04:00
Nick Mathewson a32913d5aa Allow named pipes for our log files. 
Closes ticket 12061. Based on a patch from "carlo von lynX" on tor-dev at
  https://lists.torproject.org/pipermail/tor-dev/2014-April/006705.html
 2014-08-20 13:45:16 -04:00
Nick Mathewson fb762f6db0 Merge remote-tracking branch 'public/bug11787' 2014-08-20 13:34:02 -04:00
Nick Mathewson c3f04f3daa Changes file for bug 11787 2014-08-20 13:33:49 -04:00
Nick Mathewson c57e8da4ea Merge remote-tracking branch 'public/bug12908_025' 2014-08-20 12:58:26 -04:00
Sathyanarayanan Gunasekaran a3fe8b1166 Warn if Tor is a relay and a HS 
Closes 12908; see #8742
 2014-08-20 12:56:57 -04:00
Nick Mathewson d0009cb8e8 Merge remote-tracking branch 'public/bug12728_024' 2014-08-20 12:44:15 -04:00
Nick Mathewson 764cebb4d9 Merge remote-tracking branch 'public/bug12700_024' 2014-08-20 09:00:41 -04:00
Nick Mathewson ec59167cae When counting memory from closing a connection, count the dir conn too 
Fix part of bug 11972
 2014-08-18 15:21:50 -04:00
Nick Mathewson 1196ed7cc4 Fix relay_command_to_string(); solve 12700. 
Two bugs here:
  1) We didn't add EXTEND2/EXTENDED2 to relay_command_to_string().

  2) relay_command_to_string() didn't log the value of unrecognized
     commands.

Both fixed here.
 2014-08-18 13:21:40 -04:00
Nick Mathewson 6a8d2e21b8 changes file for bug 10163 / proposal 215. 2014-08-15 18:15:57 -04:00
Nick Mathewson 1f35fd0017 Merge remote-tracking branch 'origin/maint-0.2.5' 2014-08-15 17:41:13 -04:00
Nick Mathewson ff4ba9f8a0 Missing changes file for 3f683aadcd 
Looks like I forgot to commit this.
 2014-08-15 10:06:27 -04:00
Nick Mathewson 0808ed83f9 Restore functionality for CookieAuthFileGroupReadable. 
When we merged the cookieauthfile creation logic in 33c3e60a37, we
accidentally took out this feature.  Fixes bug 12864, bugfix on
0.2.5.1-alpha.

Also adds an ExtORPortCookieAuthFileGroupReadable, since there's no
reason not to.
 2014-08-15 08:30:44 -04:00
Nick Mathewson c69e96680a Merge remote-tracking branch 'origin/maint-0.2.5' 2014-08-13 23:15:44 -04:00
Nick Mathewson d443658fad Merge remote-tracking branch 'public/bug12848_024' into maint-0.2.5 
Conflicts:
	src/or/circuitbuild.c
 2014-08-13 23:14:28 -04:00
Nick Mathewson 283730ad1c Merge remote-tracking branch 'origin/maint-0.2.5' 2014-08-13 15:11:52 -04:00
Nick Mathewson 789c8d8573 Apply an MSVC compilation fix from Gisle Vanem 
This fixes a double-define introduced in 28538069b2
 2014-08-13 15:11:00 -04:00
Nick Mathewson 9114346d32 Merge remote-tracking branch 'public/use_calloc' 2014-08-13 15:01:04 -04:00
Nick Mathewson 938deecc87 Merge remote-tracking branch 'origin/maint-0.2.5' 2014-08-13 12:52:57 -04:00
Nick Mathewson fa7ce6d3be Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 2014-08-13 12:52:40 -04:00
Nick Mathewson b45f0f8fb9 Merge remote-tracking branch 'karsten/geoip6-aug2014' into maint-0.2.4 2014-08-13 12:51:38 -04:00
Nick Mathewson 244ca67e47 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2014-08-13 12:51:27 -04:00
Nick Mathewson 4410f6fb83 Add changes file for bug12855 2014-08-13 10:39:56 -04:00
Karsten Loesing 6235b4769d Update geoip6 to the August 7 2014 database. 2014-08-13 16:16:11 +02:00
Karsten Loesing b98e3f9936 Update geoip to the August 7 2014 database. 2014-08-13 16:08:33 +02:00
Nick Mathewson b32a8b024c Don't send DESTROY to circID 0 when circuit_deliver_create_cell fails 
Cypherpunks found this and wrote this patch.

Fix for 12848; fix on (I think) d58d4c0d, which went into 0.0.8pre1
 2014-08-12 12:12:02 -04:00
Nick Mathewson 4056c61608 Fix some URLs in the README 
patch from mttp; fixes 12830
 2014-08-09 15:57:44 -04:00
Nick Mathewson bb68c731b8 Merge remote-tracking branch 'origin/maint-0.2.5' 2014-08-08 10:09:17 -04:00
Roger Dingledine fcac4b4467 Build circuits more readily when DisableNetwork goes to 0 
When Tor starts with DisabledNetwork set, it would correctly
conclude that it shouldn't try making circuits, but it would
mistakenly cache this conclusion and continue believing it even
when DisableNetwork is set to 0. Fixes the bug introduced by the
fix for bug 11200; bugfix on 0.2.5.4-alpha.
 2014-08-06 18:30:14 -04:00
Nick Mathewson 04007448b9 Correctly remove extraneous space in router family lines 
Fixes bug 12728; bugfix on 0.2.1.7-alpha when the SPLIT_IGNORE_SPACE
option was added.
 2014-08-05 11:09:08 -04:00
Nick Mathewson 0edb9b0492 Merge remote-tracking branch 'origin/maint-0.2.5' 2014-07-30 14:18:11 -04:00
Nick Mathewson 74a8555d2b Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' into maint-0.2.5 
Conflicts:
	contrib/dist/tor.service.in
 2014-07-30 14:00:21 -04:00
Nick Mathewson 88590ed3a6 Merge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into maint-0.2.5 2014-07-30 13:59:39 -04:00
intrigeri 0a70579784 Verify configuration file via ExecStartPre in the systemd unit file (#12730). 2014-07-30 16:56:55 +00:00
intrigeri 8b470ee4b5 Explicitly disable RunAsDaemon in the systemd unit file (#12731). 
Our current systemd unit uses "Type = simple", so systemd does not expect tor to
fork. If the user has "RunAsDaemon 1" in their torrc, then things won't work as
expected. This is e.g. the case on Debian (and derivatives), since there we pass
"--defaults-torrc /usr/share/tor/tor-service-defaults-torrc" (that contains
"RunAsDaemon 1") by default.

The only solution I could find is to explicitly pass "--RunAsDaemon 0" when
starting tor from the systemd unit file, which this commit does.
 2014-07-30 16:54:07 +00:00
Roger Dingledine 6c4a26b8ca Merge branch 'maint-0.2.5' 2014-07-28 02:47:43 -04:00
Roger Dingledine 29a82b5a8b Merge branch 'maint-0.2.4' into maint-0.2.5 2014-07-28 02:47:15 -04:00
Roger Dingledine 68a2e4ca4b Warn and drop the circuit if we receive an inbound 'relay early' cell 
Those used to be normal to receive on hidden service circuits due to bug
1038, but the buggy Tor versions are long gone from the network so we
can afford to resume watching for them. Resolves the rest of bug 1038;
bugfix on 0.2.1.19.
 2014-07-28 02:44:05 -04:00
Roger Dingledine 8882dcfc59 add a changes file for bug 12718 2014-07-27 15:41:30 -04:00
Roger Dingledine 2126feaabc get rid of already-merged prop221 changes file 2014-07-25 12:22:05 -04:00
Roger Dingledine b350ac0860 Merge branch 'maint-0.2.4' into maint-0.2.5 
Conflicts:
	src/or/or.h
 2014-07-25 12:15:47 -04:00