ff4ba9f8a0
Missing changes file for 3f683aadcd
...
Looks like I forgot to commit this.
2014-08-15 10:06:27 -04:00
0fc2d0edce
Documentation fix for policy_summarize().
...
Spotted by "epilys"
2014-08-15 08:53:29 -04:00
c69e96680a
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-08-13 23:15:44 -04:00
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
283730ad1c
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-08-13 15:11:52 -04:00
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
9114346d32
Merge remote-tracking branch 'public/use_calloc'
2014-08-13 15:01:04 -04:00
938deecc87
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-08-13 12:52:57 -04:00
fa7ce6d3be
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-08-13 12:52:40 -04:00
b45f0f8fb9
Merge remote-tracking branch 'karsten/geoip6-aug2014' into maint-0.2.4
2014-08-13 12:51:38 -04:00
244ca67e47
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-08-13 12:51:27 -04:00
4570805efd
Fix whitespace issues
2014-08-13 10:42:20 -04:00
4410f6fb83
Add changes file for bug12855
2014-08-13 10:39:56 -04:00
2bfd92d0d1
Apply coccinelle script to replace malloc(a*b)->calloc(a,b)
2014-08-13 10:39:56 -04:00
5da821a8a3
Add a simple coccinelle script to replace malloc->calloc
...
Coccinelle is a semantic patching tool that can automatically change
C code via semantic patching.
This script also replaces realloc with reallocarray as appropriate.
2014-08-13 10:39:56 -04:00
19b137bc05
Add reallocarray clone so we can stop doing multiply-then-reallocate
2014-08-13 10:39:56 -04:00
6235b4769d
Update geoip6 to the August 7 2014 database.
2014-08-13 16:16:11 +02:00
b98e3f9936
Update geoip to the August 7 2014 database.
2014-08-13 16:08:33 +02:00
0044d74b3c
Fix another case of 12848 in circuit_handle_first_hop
...
I looked for other places where we set circ->n_chan early, and found
one in circuit_handle_first_hop() right before it calls
circuit_send_next_onion_skin(). If onion_skin_create() fails there,
then n_chan will still be set when circuit_send_next_onion_skin()
returns. We should probably fix that too.
2014-08-12 12:15:09 -04:00
981e037fd3
Add an extra check in channel_send_destroy for circID==0
...
Prevents other cases of 12848.
2014-08-12 12:14:05 -04:00
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
2014-08-12 12:12:02 -04:00
4056c61608
Fix some URLs in the README
...
patch from mttp; fixes 12830
2014-08-09 15:57:44 -04:00
691371b802
fix extra words in man page
2014-08-09 15:40:40 -04:00
bb68c731b8
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-08-08 10:09:17 -04:00
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
0c869af7f8
fix three typos in comments
2014-08-06 02:20:51 -04:00
374611d9f6
and oh hey, repeat code :)
2014-08-03 15:45:07 -04:00
52d5ef5aff
fix typo
2014-08-03 15:43:21 -04:00
0edb9b0492
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-07-30 14:18:11 -04:00
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
88590ed3a6
Merge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into maint-0.2.5
2014-07-30 13:59:39 -04:00
0a70579784
Verify configuration file via ExecStartPre in the systemd unit file ( #12730 ).
2014-07-30 16:56:55 +00:00
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
f8cbba7a33
Cast long long arguments to (int) for tt_int_op()
2014-07-28 15:42:20 -04:00
b8ef2eaba4
and bring all the changelogs into master too
2014-07-28 04:21:45 -04:00
e3f4a96528
Merge branch 'maint-0.2.5'
...
Conflicts:
configure.ac
contrib/win32build/tor-mingw.nsi.in
src/win32/orconfig.h
2014-07-28 04:14:39 -04:00
77609161f3
bump to 0.2.5.6-alpha
2014-07-28 04:13:18 -04:00
4467e5ce56
Merge branch 'maint-0.2.4' into maint-0.2.5
2014-07-28 04:09:37 -04:00
fcbb21b414
bump to 0.2.4.23
2014-07-28 04:07:36 -04:00
6c4a26b8ca
Merge branch 'maint-0.2.5'
2014-07-28 02:47:43 -04:00
29a82b5a8b
Merge branch 'maint-0.2.4' into maint-0.2.5
2014-07-28 02:47:15 -04:00
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
8882dcfc59
add a changes file for bug 12718
2014-07-27 15:41:30 -04:00
8f70d756fb
Confusing log message when circuit can't be extended
2014-07-27 15:01:15 -04:00
3f39c0e63e
Merge branch 'maint-0.2.5'
2014-07-25 12:22:41 -04:00
2126feaabc
get rid of already-merged prop221 changes file
2014-07-25 12:22:05 -04:00
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
d5558f0072
circuit_build_failed: distinguish "first hop chan failed", "CREATE failed"
...
Roger spotted this on tor-dev in his comments on proposal 221.
(Actually, detect DESTROY vs everything else, since arma likes
network timeout indicating failure but not overload indicating failure.)
2014-07-25 11:59:00 -04:00
e001610c99
Implement proposal 221: Stop sending CREATE_FAST
...
This makes FastFirstHopPK an AUTOBOOL; makes the default "auto"; and
makes the behavior of "auto" be "look at the consensus."
2014-07-25 11:59:00 -04:00
bdc2cefd4e
Merge branch 'maint-0.2.5'
2014-07-24 19:49:29 -04:00
Nick Mathewson
Karsten Loesing
Roger Dingledine
intrigeri
Peter Palfrader
Arlo Breault