teor
c200ab46b8
Merge branch 'bug14001-clang-warning' into bug13111-empty-key-files-fn-empty
...
Conflicts:
src/or/router.c
Choose newer comment.
Merge changes to comment and function invocation.
2015-01-10 16:34:10 +11:00
teor
6a9cae2e1d
Fix clang warning, IPv6 address comment, buffer size typo
...
The address of an array in the middle of a structure will
always be non-NULL. clang recognises this and complains.
Disable the tautologous and redundant check to silence
this warning.
A comment about an IPv6 address string incorrectly refers
to an IPv4 address format.
A log buffer is sized 10024 rather than 10240.
Fixes bug 14001.
2014-12-20 22:20:54 +11:00
Nick Mathewson
f7e8bc2b4b
fix a long line
2014-12-12 08:54:07 -05:00
Nick Mathewson
7d5916c0a7
Reference bug number in changes file
2014-12-12 08:53:42 -05:00
Nick Mathewson
915c9a517e
Merge remote-tracking branch 'meejah/ticket-13941-b'
2014-12-12 08:53:14 -05:00
Nick Mathewson
7c5d888977
Tweak 13942 fix
2014-12-12 08:49:52 -05:00
meejah
85bfad1875
Pre-check hidden-service-dir permissions/ownership
...
See ticket #13942 where Tor dies if you feed it a hidden service
directory with the wrong owner via SETCONF.
2014-12-11 18:46:56 -07:00
meejah
76753efd7b
Fix 13941: make calling log_new_relay_greeting() optional.
...
Specifically, only if we're creating secret_id_key do we log the
greeting (and then only if the key is actually created).
2014-12-11 18:43:51 -07:00
Roger Dingledine
b73a7600af
when somebody uploads too much, say who tried it
2014-12-10 01:10:44 -05:00
rl1987
9c239eccc9
Use END_CIRC_REASON_TORPROTOCOL instead of magic number.
2014-12-07 15:47:09 +02:00
Nick Mathewson
3c0e09ef81
Add fakechans.h to noinst_headers
2014-12-04 09:19:44 -05:00
Nick Mathewson
58df153163
Fix more 64/32 warnings in test_channel.c
2014-12-04 09:16:49 -05:00
Nick Mathewson
11c044e46a
Initialize libevent in circuitmux/destroy_cell_queue test
2014-12-04 09:11:13 -05:00
Nick Mathewson
11b652acb3
Fix some 32-bit build issues in the tests
...
When comparing 64-bit types, you need to use tt_[ui]64_op().
Found by Jenkins
2014-11-28 10:06:10 -05:00
Nick Mathewson
430f5852ac
Fix a signed/unsigned comparison warning in scheduler_run
2014-11-28 09:18:17 -05:00
Nick Mathewson
0bfadbf4b9
Fix a memory leak in rend_services_introduce
...
This is CID 1256187 ; bug not in any released tor.
2014-11-27 23:24:03 -05:00
Nick Mathewson
49976fabc4
Fix a likely bug found by coverity in test_scheduler.c.
...
Andrea, do you agree with this?
This is CID 1256186
2014-11-27 23:21:46 -05:00
Nick Mathewson
95ead31349
Tweak global_scheduler changes file
2014-11-27 23:05:21 -05:00
Nick Mathewson
e2641484a7
One more, appease "make check-spaces"
2014-11-27 22:57:04 -05:00
Nick Mathewson
b1e1b439b8
Fix some issues with the scheduler configuration options
...
1) Set them to the values that (according to Rob) avoided performance
regressions. This means that the scheduler won't get much exercise
until we implement KIST or something like it.
2) Rename the options to end with a __, since I think they might be
going away, and nobody should mess with them.
3) Use the correct types for the option variables. MEMUNIT needs to be a
uint64_t; UINT needs to be (I know, I know!) an int.
4) Validate the values in options_validate(); do the switch in
options_act(). This way, setting the option to an invalid value on
a running Tor will get backed out.
2014-11-27 22:51:13 -05:00
Nick Mathewson
0e0dc7d787
Fix a 64-bit clang warning
2014-11-27 22:42:03 -05:00
Nick Mathewson
a28df3fb67
Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold'
...
Conflicts:
src/or/or.h
src/test/Makefile.nmake
2014-11-27 22:39:46 -05:00
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
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