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
17,028 Commits 53 Branches 631 Tags
9c58905a2bfd1049613173c27c357e8a20ff066a
Commit Graph

2419 Commits

Author SHA1 Message Date
Nick Mathewson da30adcf0f Merge remote-tracking branch 'origin/maint-0.2.4' 
Conflicts:
	src/common/crypto.c
 2013-04-18 11:16:05 -04:00
Nick Mathewson 9fec0c1a95 Remove a double-newline 2013-04-18 11:14:05 -04:00
Nick Mathewson 8362f8854a Merge branch 'less_charbuf_rebased' into maint-0.2.4 
Conflicts:
	src/or/dirserv.c
	src/or/dirserv.h
	src/test/test_dir.c
 2013-04-18 11:13:36 -04:00
Nick Mathewson e1128d905c Fix a couple of documentation issues. 2013-04-18 11:04:57 -04:00
Nick Mathewson cb75519bbf Refactor dirobj signature generation 
Now we can compute the hash and signature of a dirobj before
concatenating the smartlist, and we don't need to play silly games
with sigbuf and realloc any more.
 2013-04-18 11:04:57 -04:00
Nick Mathewson bbc049a756 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-04-17 10:48:39 -04:00
Nick Mathewson 42731f69ef Merge branch 'bug8037_squashed' into maint-0.2.4 2013-04-17 10:45:45 -04:00
Nick Mathewson a934376049 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-04-02 10:42:53 -04:00
Nick Mathewson 856d57531b Merge remote-tracking branch 'public/bug7707_diagnostic' into maint-0.2.4 2013-04-02 10:41:14 -04:00
Nick Mathewson 80e9ca411f Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-23 18:51:15 -04:00
Nick Mathewson 8b6a952c94 Avoid clang warnings from implicit off_t->size_t cast 2013-03-23 18:50:21 -04:00
Nick Mathewson c547502ecb Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-19 16:15:39 -04:00
Nick Mathewson 6f20a74d52 Merge branch 'bug8240_v2_squashed' into maint-0.2.4 
Conflicts:
	doc/tor.1.txt
	src/or/circuitbuild.c
	src/or/config.c
	src/or/or.h
 2013-03-19 16:15:27 -04:00
Nick Mathewson 343f7aa059 Make the guard lifetime configurable and adjustable via the consensus 
Fixes 8240.

(Don't actually increase the default guard lifetime. It seems likely to
break too many things if done precipitiously.)
 2013-03-19 16:02:19 -04:00
Nick Mathewson acbfc9c8cc Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-19 15:32:44 -04:00
Nick Mathewson a7b46336eb Merge remote-tracking branch 'public/bug7950' into maint-0.2.4 2013-03-19 15:32:17 -04:00
Nick Mathewson 01af92fede Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-19 14:27:00 -04:00
Nick Mathewson 8d29866bec Merge remote-tracking branch 'public/bug8002' into maint-0.2.4 2013-03-19 14:26:45 -04:00
Nick Mathewson c101ecc8dc Merge remote-tracking branch 'asn/bug3594_rebased_and_fixed' 
Conflicts:
	src/common/util.c
	src/or/entrynodes.h
 2013-03-19 13:25:45 -04:00
Nick Mathewson e5b79b5bb5 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-18 15:44:45 -04:00
Nick Mathewson 0b827cbcb1 Fix another case of bug 8206; patch from flupzor 2013-03-18 15:44:23 -04:00
Nick Mathewson 19d6650f81 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-18 15:41:14 -04:00
Nick Mathewson eff1cfaaf7 Merge remote-tracking branch 'public/bug6673' into maint-0.2.4 2013-03-18 15:40:50 -04:00
Nick Mathewson a88f3e24ea Merge remote-tracking branch 'origin/maint-0.2.4' 
Conflicts:
	src/test/test_addr.c
 2013-03-18 15:29:32 -04:00
Nick Mathewson 2ac66e59f7 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 
Conflicts:
	src/test/test_addr.c
 2013-03-18 15:28:39 -04:00
Nick Mathewson a770e1cc22 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-18 14:30:28 -04:00
Nick Mathewson 63b67577d6 Check return values from fcntl and setsockopt 
(Based on a patch from flupzor; bug #8206)
 2013-03-18 14:28:38 -04:00
Nick Mathewson b163e801bc Merge remote-tracking branch 'origin/maint-0.2.4' 
Conflicts:
	src/or/routerlist.c
 2013-03-15 12:20:17 -04:00
Nick Mathewson 0cf327dc78 Merge remote-tracking branch 'public/unused_stuff' into maint-0.2.4 2013-03-15 12:17:23 -04:00
Nick Mathewson 452cfaacfc Track TLS overhead: diagnostic for bug 7707 2013-03-11 22:06:07 -04:00
Nick Mathewson fdafe11a25 Give an #error when we want threads and OpenSSL has disabled threads 
Fixes ticket 6673.
 2013-03-11 13:23:10 -04:00
Roger Dingledine 331e4dcb46 Merge branch 'maint-0.2.4' 2013-03-10 23:42:14 -04:00
Roger Dingledine 0196647970 start part-way through the ssl cert lifetime 
also, snap the start time and end time to a day boundary, since most
certs in the wild seem to do this.
 2013-03-10 23:38:18 -04:00
Nick Mathewson 55ce9bff54 Remove unused check_fingerprint_syntax 2013-03-01 22:01:26 -05:00
Nick Mathewson a05dc378e3 Remove unused HMAC-SHA1 function 
(We're not adding any new SHA1 instances in our protocols, so this
should never actually be needed.)
 2013-03-01 21:59:12 -05:00
Nick Mathewson 6dfa709030 Remove the unused addr_mask_cmp_bits 2013-03-01 14:46:34 -05:00
Nick Mathewson 24fb926726 Remove the unused parse_addr_and_port_range 2013-03-01 14:35:17 -05:00
Nick Mathewson b528aaef03 Make sure that [::1] is recognized as a private address 
Fixes bug 8377; bugfix on 0.2.1.3-alpha.
 2013-03-01 12:22:57 -05:00
Nick Mathewson c72d58cbff Merge remote-tracking branch 'public/feature8109' 2013-03-01 00:33:37 -05:00
Nick Mathewson a4e9d67292 Remove some functions which were unused except for their tests 2013-02-23 23:38:43 -05:00
Nick Mathewson 5bfa373eee Remove some totally unused functions 2013-02-23 23:31:31 -05:00
Nick Mathewson 365e302f61 Remove a bunch of unused macro definitions 2013-02-23 23:05:25 -05:00
Nick Mathewson 1827be0bd6 Make a parse_config_line_from_str variant that gives error messages 
Without this patch, there's no way to know what went wrong when we
fail to parse a torrc line entirely (that is, we can't turn it into
a K,V pair.)  This patch introduces a new function that yields an
error message on failure, so we can at least tell the user what to
look for in their nonfunctional torrc.

(Actually, it's the same function as before with a new name:
parse_config_line_from_str is now a wrapper macro that the unit
tests use.)

Fixes bug 7950; fix on 0.2.0.16-alpha (58de695f90) which first
introduced the possibility of a torrc value not parsing correctly.
 2013-02-19 17:36:17 -05:00
Nick Mathewson 22804c0391 Check for CPUs more accurartely when ONLN != CONF. 
There are two ways to use sysconf to ask about the number of
CPUs. When we're on a VM, we would sometimes get it wrong by asking
for the number of total CPUs (say, 64) when we should have been asking
for the number of CPUs online (say, 1 or 2).

Fix for bug 8002.
 2013-02-19 02:34:36 -05:00
Nick Mathewson da6720e9fa Make _SC_OPEN_MAX actually get used when closing fds before exec. 
Fixes bug 8209; bugfix on 0.2.3.1-alpha.
 2013-02-11 16:27:35 -05:00
George Kadianakis 266f8cddd8 Refactoring to make parse_bridge_line() unittestable. 
- Make parse_bridge_line() return a struct.
- Make bridge_add_from_config() accept a struct.
- Make string_is_key_value() less hysterical.
 2013-02-11 18:07:26 +00:00
Nick Mathewson 2b4d4ccb3d Merge remote-tracking branch 'public/bug7801_v2' 2013-02-11 11:28:08 -05:00
George Kadianakis b5dceab175 Fix various issues pointed out by Nick and Andrea. 
- Document the key=value format.
- Constify equal_sign_pos.
- Pass some strings that are about to be logged to escape().
- Update documentation and fix some bugs in tor_escape_str_for_socks_arg().
- Use string_is_key_value() in parse_bridge_line().
- Parenthesize a forgotten #define
- Add some more comments.
- Add some more unit test cases.
 2013-02-09 18:46:10 +00:00
George Kadianakis b8532bcb1e Add utility functions needed for SOCKS argument parsing. 2013-02-09 16:30:16 +00:00
Nick Mathewson 69ab7cd828 Improve comment at Andrea's request 2013-02-08 17:13:11 -05:00