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
16,770 Commits 53 Branches 631 Tags
a770e1cc22e416b84dcc4e8c81fcec5483d2d00c
Commit Graph

11849 Commits

Author SHA1 Message Date
Nick Mathewson a770e1cc22 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-18 14:30:28 -04:00
Nick Mathewson 57ffef3f89 Remove an unused local variable. 2013-03-18 14:30:11 -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 3fa9c9b688 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-18 14:24:30 -04:00
Nick Mathewson eb9420082d Check for 0.2.4.8, not 0.2.4.7, to determine EXTEND2 support 
Fixes bug 8464; bugfix on b2863739 in 0.2.4.8-alpha
 2013-03-18 14:23:19 -04:00
Nick Mathewson f48daef299 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-15 12:38:55 -04:00
Nick Mathewson 8b4728ebd6 Merge remote-tracking branch 'public/bug8180_023_v2' into maint-0.2.4 2013-03-15 12:38:11 -04:00
Nick Mathewson 686aaa5c4c Upgrade the warn for EntryNodes without UseEntryGuards to an error 
fixes bug 8180
 2013-03-15 12:34:29 -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 e4d2177d31 Fix some basic socket issues with tor-fw-helper-natpmp on windows 
This isn't going to be the last of these issues, but we might as
well take the fixes as we find them.

Patch from Gisle Vanem, fixes bug 7280.
 2013-03-15 12:11:38 -04:00
David Fifield a0b92cd800 Fix brackets in tor-fw-helper help output. 
Change nesting from [(]) to [()]. Formerly it made it look to me at
first glance that "internal port" was optional.

      [Trivial change; fixes #7767  --nickm]
 2013-03-15 11:23:47 -04:00
Nick Mathewson 9be3389dc7 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-14 12:06:58 -04:00
Nick Mathewson 653b09e1ec Make circuit_purpose_to_string handle CIRCUIT_PURPOSE_PATH_BIAS_TESTING 2013-03-14 12:06:03 -04:00
Nick Mathewson d89b8e0751 Merge remote-tracking branch 'karsten/geoip-manual-update-mar2013' 2013-03-11 13:34:32 -04:00
Nick Mathewson 2a02efb601 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-11 13:32:35 -04:00
Nick Mathewson ef4db31693 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2013-03-11 13:32:16 -04:00
Nick Mathewson c6ca199888 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 2013-03-11 13:32:01 -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
Roger Dingledine edd6f02273 randomize SSLKeyLifetime by default 
resolves ticket 8443.
 2013-03-10 23:38:18 -04:00
Roger Dingledine 599aeef9bc parameterize SSLKeyLifetime 
no actual changes in behavior yet
 2013-03-10 23:38:18 -04:00
Nick Mathewson aa3126b5b4 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-10 23:03:17 -04:00
Nick Mathewson e270a066a6 Merge remote-tracking branch 'arma/bug6783_big_hammer' into maint-0.2.4 2013-03-10 23:01:58 -04:00
Nick Mathewson e4c5001bad Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-10 23:00:13 -04:00
Benjamin Kerensa 8b4195f021 Fix typos in a few log messages 2013-03-10 22:59:19 -04:00
Roger Dingledine f8960ea22b set DisableV2DirectoryInfo_ off by default 
since it's only enableable by authorities, nobody else would be able
to start their tor
 2013-03-10 20:40:15 -04:00
Nick Mathewson 926b3d77f1 Tweak bug6783 patch. 2013-03-10 20:31:58 -04:00
Nick Mathewson e4614d30e5 Add a DisableV2DirectoryInfo_ option to 404 all v2 ns requests 
I have no idea whether b0rken clients will DoS the network if the v2
authorities all turn this on or not.  It's experimental. See #6783 for
a description of how to test it more or less safely, and please be
careful!
 2013-03-10 20:31:53 -04:00
Nick Mathewson 4235425fce Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-10 19:53:31 -04:00
Nick Mathewson 339df5df08 Fix 8447: use %u to format circid_t. 
Now that circid_t is 4 bytes long, the default integer promotions will
leave it alone when sizeof(int) == 4, which will leave us formatting an
unsigned as an int.  That's technically undefined behavior.

Fixes bug 8447 on bfffc1f0fc.  Bug not
in any released Tor.
 2013-03-10 19:52:06 -04:00
Karsten Loesing 3dde6d5d29 Update to the March 2013 GeoIP database. 2013-03-07 20:58:31 +01:00
Karsten Loesing 5cad78c2ce Manually fix yet another fourteen 'A1' ranges. 
MaxMind added fourteen new 'A1' ranges in their March 2013 database that
the automatic substitution algorithm couldn't fix.  Fix them manually.
 2013-03-07 20:55:46 +01:00
Nick Mathewson 62ef02ad65 A couple more easy unit tests 2013-03-02 10:56:57 -05: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 289653c392 Remove a few more unused functions. 2013-03-01 21:57:52 -05:00
Nick Mathewson a6c7630845 Unit tests for a few more functions and cases in address.c 
This brings address's coverage up over 80%.
 2013-03-01 14:48:33 -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 f6697d5b3b More unit tests for old TAP onion handshake. 
The test coverage for onion_tap.c is now at 89%, up from 67%.
 2013-03-01 14:06:09 -05:00
Andrea Shepard 74c33945e3 Correctly set entry->is_dir_cache when adding an entry guard for the first time 
(Second part of a bug8367 fix. -NM)
 2013-03-01 10:17:07 -05:00
Nick Mathewson ad49abe5a1 Fix bootstrapping with bridges by making is_dir_cache is set on them. 
This fixes bug 8367, introduced in d7089ff228. Not in
any released Tor.
 2013-03-01 10:17:07 -05:00
Andrea Shepard 8b26766a66 Correctly set entry->is_dir_cache when adding an entry guard for the first time 
(Second part of a bug8367 fix. -NM)
 2013-03-01 09:32:37 -05:00
Nick Mathewson c0b1f05fe7 Fix bootstrapping with bridges by making is_dir_cache is set on them. 
This fixes bug 8367, introduced in d7089ff228. Not in
any released Tor.
 2013-03-01 09:32:17 -05:00
Nick Mathewson c72d58cbff Merge remote-tracking branch 'public/feature8109' 2013-03-01 00:33:37 -05:00
Nick Mathewson 94d0f226e6 Whoops. I forgot the "alpha" 2013-03-01 00:16:46 -05:00
Nick Mathewson d9293ab3a7 Bump version in master to 0.2.5.0-alpha-dev 2013-03-01 00:13:36 -05:00
Nick Mathewson 6879910334 Fix a comment in tor_main.c 
We don't use subversion or src/*/makefile.am any longer
 2013-02-25 03:24:53 -05:00
Nick Mathewson a4e9d67292 Remove some functions which were unused except for their tests 2013-02-23 23:38:43 -05:00