Nick Mathewson
a046966baf
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/config.c
src/or/or.h
2011-06-19 21:00:15 -04:00
Robert Ransom
eeedc5c13c
Put hashes of all tor source files into or_sha1.i
2011-06-18 00:54:04 -07:00
Nick Mathewson
3b41551b61
Revert "Add an "auto" option to UseBridges"
...
This reverts commit 507c1257a4
2011-06-17 16:45:53 -04:00
Nick Mathewson
42d6f34590
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-17 15:25:18 -04:00
Nick Mathewson
85d4c290d7
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-06-17 15:24:23 -04:00
Robert Ransom
010b8dd4f6
Abandon rendezvous circuits on SIGNAL NEWNYM
2011-06-17 15:22:23 -04:00
Nick Mathewson
31b9b1a5bb
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-17 15:04:29 -04:00
Nick Mathewson
209229f100
Merge branch 'bug3407' into maint-0.2.2
2011-06-17 14:59:39 -04:00
Robert Ransom
227896e447
Make send_control_event_impl's behaviour sane
2011-06-17 13:57:25 -04:00
Robert Ransom
70785f87bb
Fix comment typo
2011-06-17 13:57:25 -04:00
Robert Ransom
68cd0a9abe
Make connection_printf_to_buf's behaviour sane
2011-06-17 13:57:25 -04:00
Roger Dingledine
64bfbcb918
log when we finish ssl handshake and move to renegotiation
...
debug-level since it will be quite common. logged at both client
and server side. this step should help us track what's going on
with people filtering tor connections by our ssl habits.
2011-06-17 03:31:59 -04:00
Nick Mathewson
a857f61e27
Merge remote-tracking branch 'rransom-tor/bug3332-v2'
2011-06-15 11:33:40 -04:00
Robert Ransom
44eafa9697
Assert that HS operations are not performed using single-hop circuits
...
(with fixes by Nick Mathewson to unbreak the build)
2011-06-14 21:32:49 -07:00
Nick Mathewson
875a551409
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-14 13:46:46 -04:00
Nick Mathewson
a25c0a5bf8
Merge remote-tracking branch 'public/bug3369' into maint-0.2.2
2011-06-14 13:46:10 -04:00
Nick Mathewson
19febed9e5
Merge remote-tracking branch 'rransom-tor/bug3349'
2011-06-14 13:39:26 -04:00
Nick Mathewson
47c8433a0c
Make the get_options() return const
...
This lets us make a lot of other stuff const, allows the compiler to
generate (slightly) better code, and will make me get slightly fewer
patches from folks who stick mutable stuff into or_options_t.
const: because not every input is an output!
2011-06-14 13:17:06 -04:00
Nick Mathewson
22efe20309
Fix another check_private_dir instance in master
2011-06-14 12:28:16 -04:00
Nick Mathewson
8839b86085
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-14 12:25:33 -04:00
Jérémy Bobbio
54d7d31cba
Make ControlSocketsGroupWritable work with User.
...
Original message from bug3393:
check_private_dir() to ensure that ControlSocketsGroupWritable is
safe to use. Unfortunately, check_private_dir() only checks against
the currently running user… which can be root until privileges are
dropped to the user and group configured by the User config option.
The attached patch fixes the issue by adding a new effective_user
argument to check_private_dir() and updating the callers. It might
not be the best way to fix the issue, but it did in my tests.
(Code by lunar; changelog by nickm)
2011-06-14 12:18:32 -04:00
George Kadianakis
93526cdf0b
Fixes small bugs.
2011-06-14 16:00:55 +02:00
George Kadianakis
5b050a9b08
This commit is an attempt to beautify the previous commit.
...
It creates some helper functions that return the proxy type, proxy addr/port, etc.
2011-06-14 04:28:36 +02:00
George Kadianakis
abe03f4943
Our warning now is much more specific, mentioning proxy type/addr/port.
...
Not included in the previous commit, because the implementation is
ugly; I see no other way of doing this though.
2011-06-14 03:27:07 +02:00
George Kadianakis
a79bea40d8
We now warn the user if a proxy server is not up when we try to connect with it.
2011-06-14 02:51:59 +02:00
intrigeri
910472c514
client-side DNS proxy server: reply NOTIMPL to unsupported queries
...
Fix for bug 3369.
2011-06-13 13:37:45 -04:00
George Kadianakis
00ec4b2c00
Various trivial changes.
...
* Improved function documentation.
* Renamed find_bridge_transport_by_addrport() to
find_transport_by_bridge_addrport().
* Sanitized log severities we use.
* Ran check-spaces.
2011-06-12 16:41:32 +02:00
George Kadianakis
29203b7f3f
We can now connect using transports as well!
2011-06-12 00:14:11 +02:00
George Kadianakis
e09f302589
We can now match our transports with our bridges.
2011-06-11 23:20:39 +02:00
George Kadianakis
20c31c80fb
ClientTransportPlugin parsing done.
2011-06-11 17:08:31 +02:00
Sebastian Hahn
8283767365
Fix a memleak in nodelist_assert_ok()
2011-06-08 21:38:42 +02:00
Sebastian Hahn
f303274490
Fix a rare memleak during stats writing
...
If rep_hist_buffer_stats_write() was called unitinitalized, we'd leak
memory.
2011-06-08 21:35:26 +02:00
Sebastian Hahn
680646e0de
Don't use signed 1-bit bitfields
...
This was harmless, we never compared it to anything but itself or 0.
But Coverity complained, and it had a point.
2011-06-08 21:30:41 +02:00
Sebastian Hahn
9e56ac27da
Comment out some obviously dead code.
...
Coverity warned about it, it's harmless to comment out.
2011-06-08 21:30:41 +02:00
Sebastian Hahn
e6fff7235e
Remove a few dead assignments during router parsing
2011-06-08 21:30:40 +02:00
Sebastian Hahn
3033f8459b
Remove a dead variable in the heartbeat code
2011-06-08 21:11:42 +02:00
Sebastian Hahn
db7dd3ee7a
remove some dead code, found by coverity
2011-06-08 21:07:54 +02:00
Sebastian Hahn
da3256b5ae
Update the uptime string to include an hours indicator
...
Before, it wasn't really obvious if one meant hours:minutes or
minutes:seconds etc.
2011-06-08 19:52:30 +02:00
Nick Mathewson
d696bd1bfc
Fix crash bug (3361) when setting off-flavor networkstatus
...
When we set a networkstatus in the non-preferred flavor, we'd check
the time in the current_consensus. But that might have been NULL,
which could produce a crash as seen in bug 3361.
2011-06-07 14:46:28 -04:00
Nick Mathewson
8cd5a3c186
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-06 16:20:22 -04:00
Nick Mathewson
42e4e156d9
Detect insanely large circuit build state; don't give its length to rand_int
2011-06-06 16:18:06 -04:00
Robert Ransom
8a69cc0468
Report SIGNAL event to controllers when acting on delayed NEWNYM
...
Fixes bug 3349.
2011-06-05 05:43:27 -07:00
Robert Ransom
f45261cb29
Increase default required uptime for HSDirs to 25 hours
2011-06-03 12:17:53 -04:00
Robert Ransom
1546054d81
Add a VoteOnHidServDirectoriesV2 configuration option
2011-06-03 12:16:55 -04:00
Nick Mathewson
12f9c91c06
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-03 11:36:21 -04:00
Nick Mathewson
7aa20b20bf
Merge branch 'bug3318c' into maint-0.2.2
2011-06-03 11:34:32 -04:00
Nick Mathewson
bbf2fee8ff
Reject 128-byte keys that are not 1024-bit
...
When we added the check for key size, we required that the keys be
128 bytes. But RSA_size (which defers to BN_num_bytes) will return
128 for keys of length 1017..1024. This patch adds a new
crypto_pk_num_bits() that returns the actual number of significant
bits in the modulus, and uses that to enforce key sizes.
Also, credit the original bug3318 in the changes file.
2011-06-03 11:31:19 -04:00
Nick Mathewson
50e4c98a5a
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-03 11:18:03 -04:00
Nick Mathewson
14c0251d95
Use an autobool for UseBridges_
2011-06-03 11:17:15 -04:00
Nick Mathewson
de069f5ea7
Merge remote-tracking branch 'rransom/bug2748-v2' into maint-0.2.2
2011-06-03 11:16:48 -04:00
