Nick Mathewson
3d2366c676
Merge remote-tracking branch 'public/bug13126'
...
Conflicts:
src/or/or.h
2014-11-26 09:03:30 -05:00
Nick Mathewson
3a91a08e21
Merge branch 'feature9503_squashed'
2014-11-25 12:49:09 -05:00
rl1987
bf67a60b86
Sending response to SIGNAL HEARTBEAT controller command.
2014-11-25 12:48:41 -05:00
rl1987
8c135062e5
Adding 'SIGNAL HEARTBEAT' message that causes unscheduled heartbeat.
2014-11-25 12:48:41 -05:00
Nick Mathewson
b4ead16d57
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-11-24 09:19:22 -05:00
Nick Mathewson
5b55778c86
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-11-24 09:19:06 -05:00
Nick Mathewson
137982f955
Merge remote-tracking branch 'karsten/geoip6-nov2014' into maint-0.2.4
2014-11-24 09:18:36 -05:00
Nick Mathewson
8d5f1e6961
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-11-24 09:18:21 -05:00
Karsten Loesing
5441c733e0
Update geoip6 to the November 15 2014 database.
2014-11-24 14:23:18 +01:00
Karsten Loesing
8611c6bccd
Update geoip to the November 15 2014 database.
2014-11-24 14:21:31 +01:00
Nick Mathewson
6218f48950
Use consistent formatting for list of directory authorities
...
Based on a patch from grpamp on tor-dev.
2014-11-24 01:34:17 -05:00
Nick Mathewson
336c856e52
Make can_complete_circuits a static variable.
2014-11-20 12:03:46 -05:00
Nick Mathewson
f15cd22bb7
Don't build introduction circuits until we know we can build circuits
...
Patch from akwizgran. Ticket 13447.
2014-11-20 11:51:36 -05:00
Nick Mathewson
126f220071
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-11-19 17:27:37 -05:00
Nick Mathewson
0872d8e3cf
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-11-19 17:26:42 -05:00
Micah Anderson
dca902ceba
Update longclaw dirauth IP to be a more stable location
2014-11-19 17:22:25 -05:00
Nick Mathewson
fb3000e10c
whoops; removed the documentation for Support022HiddenServices too
2014-11-17 21:16:33 -05:00
Nick Mathewson
b3bd7a736c
Remove Support022HiddenServices
...
This has been already disabled in the directory consensus for a while;
it didn't seem to break anything.
Finally closes #7803 .
2014-11-17 11:52:10 -05:00
Nick Mathewson
734ba5cb0a
Use smaller zlib objects when under memory pressure
...
We add a compression level argument to tor_zlib_new, and use it to
determine how much memory to allocate for the zlib object. We use the
existing level by default, but shift to smaller levels for small
requests when we have been over 3/4 of our memory usage in the past
half-hour.
Closes ticket 11791.
2014-11-17 11:43:50 -05:00
rl1987
a68b90fc7a
Changes file for 13212.
2014-11-16 16:12:08 +02:00
rl1987
620e251dcc
Rewriting comment for control_event_hs_descriptor_failed().
2014-11-16 16:06:00 +02:00
rl1987
0db96d023b
Adding REASON field to HS_DESC FAILED controller event.
2014-11-16 15:51:23 +02:00
Nick Mathewson
ab08d8c4f7
document that hiddenserviceport can have an ipv6 addr.for 12670
2014-11-14 11:19:34 -05:00
Nick Mathewson
5c813f6ca1
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-11-12 15:32:15 -05:00
Nick Mathewson
6c146f9c83
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
...
Conflicts:
src/or/config.c
2014-11-12 15:30:11 -05:00
Sebastian Hahn
0493db4adb
Add changes file for #13926
2014-11-12 15:25:52 -05:00
Micah Anderson
b6e7b8c88c
Remove turtles as a directory authority ( #13296 )
2014-11-12 15:25:52 -05:00
Micah Anderson
ad448c6405
Add longclaw as a directory authority ( #13296 )
2014-11-12 15:25:52 -05:00
Nick Mathewson
9b11dc3617
Merge remote-tracking branch 'public/bug7484'
...
Conflicts:
src/test/test_addr.c
2014-11-12 13:44:57 -05:00
Nick Mathewson
4ac5175109
Fix wide lines (from 13172)
2014-11-12 13:42:01 -05:00
Nick Mathewson
a3dafd3f58
Replace operators used as macro arguments with OP_XX macros
...
Part of fix for 13172
2014-11-12 13:28:07 -05:00
Nick Mathewson
2170171d84
Merge branch 'ticket13172'
2014-11-12 13:25:17 -05:00
Nick Mathewson
d85270e13c
Reenhappy make check-spaces
2014-11-12 13:15:10 -05:00
Nick Mathewson
81433e7432
Merge remote-tracking branch 'rl1987/bug13644'
2014-11-12 13:12:14 -05:00
Nick Mathewson
ccc54d545e
tweak 9812 changes file
2014-11-12 10:28:33 -05:00
Nick Mathewson
99e2a325f6
Merge remote-tracking branch 'rl1987/bug9812'
2014-11-12 10:27:12 -05:00
Nick Mathewson
a87c697fb1
Merge remote-tracking branch 'public/bug13698_024_v1'
2014-11-12 10:23:55 -05:00
Nick Mathewson
5e4174f3b4
Revise changes file
2014-11-12 10:23:24 -05:00
rl1987
032560fc75
Adding changes file for 13644.
2014-11-11 21:01:30 +02:00
rl1987
a6520ed537
Renaming ROUTER_WAS_NOT_NEW to ROUTER_IS_ALREADY_KNOWN.
2014-11-11 20:56:40 +02:00
rl1987
f9d73eea9c
Comment possible values of was_router_added_t.
2014-11-11 20:37:39 +02:00
David Goulet
34eb007d22
Fix: don't report timeout when closing parallel intro points
...
When closing parallel introduction points, the given reason (timeout)
was actually changed to "no reason" thus when the circuit purpose was
CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT, we were reporting an introduction
point failure and flagging it "unreachable". After three times, that
intro point gets removed from the rend cache object.
In the case of CIRCUIT_PURPOSE_C_INTRODUCING, the intro point was
flagged has "timed out" and thus not used until the connection to the HS
is closed where that flag gets reset.
This commit adds an internal circuit reason called
END_CIRC_REASON_IP_NOW_REDUNDANT which tells the closing circuit
mechanism to not report any intro point failure.
This has been observed while opening hundreds of connections to an HS on
different circuit for each connection. This fix makes this use case to
work like a charm.
Fixes #13698 .
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2014-11-10 15:02:54 -05:00
Nick Mathewson
26e7e519dc
Document networkstatus-bridges
...
Closes 13713; patch from 'tom'
2014-11-10 09:03:11 -05:00
rl1987
e395783f23
Adding changes file for 9812.
2014-11-09 17:55:35 +02:00
rl1987
7025f2dc59
Print a warning when extra info document is found incompatible with router descriptor.
2014-11-09 17:41:18 +02:00
rl1987
4b18d8931b
Downgrade RSA signature verification failure error message to info loglevel.
2014-11-09 17:39:23 +02:00
rl1987
7f7df97579
Fixing typo in manpage.
2014-11-09 16:34:34 +02:00
David Goulet
151f5f90b8
Wrong format in log statement
...
Fixes bug 13701.
2014-11-07 11:44:41 -05:00
Nick Mathewson
5b1971c7f3
test_checkdir.c: Perhaps this is what will make this test pass on windows?
2014-11-07 09:28:49 -05:00
Nick Mathewson
85a76cd4eb
test_checkdir.c: try to make it pass on windows
...
also fix memory-leak on failing tests.
2014-11-07 08:54:44 -05:00
