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,551 Commits 53 Branches 631 Tags
2f2fa7683d768ce165e9fc5b6f22d2fdcd79d9ca
Commit Graph

2386 Commits

Author SHA1 Message Date
Nick Mathewson 3892e03cfc Merge remote-tracking branch 'origin/maint-0.2.4' 2013-09-16 12:48:45 -04:00
Nick Mathewson ace95c525c Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2013-09-16 12:47:05 -04:00
Nick Mathewson b46353b793 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 2013-09-16 12:46:50 -04:00
Nick Mathewson 25a3ae922f Merge remote-tracking branch 'Ryman/bug6384' 
Conflicts:
	src/or/config.c
	src/or/main.c
 2013-09-13 12:55:53 -04:00
Nick Mathewson e35c972851 Merge branch 'bug4647_squashed' 2013-09-13 12:36:55 -04:00
Nick Mathewson aac4f30d23 Add a --dump-config option to help testing option parsing. 2013-09-13 12:36:40 -04:00
Nick Mathewson 75d795b1d7 Disallow --hash-password with no commandline arguments. 
Fixes bug 9573.

Bugfix on 59453ac6e in 0.0.9pre5, which fixed a crash in a silly way.
 2013-09-13 12:36:40 -04:00
Nick Mathewson 34ec954f8e Expose commandline parser so that we can use it for --quiet,etc. 
Fix for bug 9578.
 2013-09-13 12:36:39 -04:00
Cristian Toader d98dfb3746 Patch for 4647 (rewrite command line parser) 2013-09-13 12:36:26 -04:00
Karsten Loesing 13d192c1d8 Update to the September 2013 GeoIP database. 2013-09-10 15:00:06 +02:00
Nick Mathewson c7113e702b Merge remote-tracking branch 'public/bug9645' 2013-09-05 09:59:07 -04:00
Roger Dingledine 86907ea4db Merge branch 'maint-0.2.4' 2013-09-05 02:34:58 -04:00
Roger Dingledine 2c877d2da4 collect and log statistics about onionskins received/processed 
we skip onionskins that came from non-relays, so we're less likely to
run into privacy troubles.

starts to implement ticket 9658.
 2013-09-05 01:44:52 -04:00
Roger Dingledine 6156887adf Merge branch 'maint-0.2.4' 
Conflicts:
	src/test/test.c
 2013-09-04 23:44:39 -04:00
Roger Dingledine 71e0ca02b5 add a changes entry for ticket 9574 2013-09-04 23:21:46 -04:00
Nick Mathewson d5e9573ed2 Merge remote-tracking branch 'origin/maint-0.2.4' 
Conflicts:
	src/or/circuituse.c
 2013-09-04 16:11:20 -04:00
Nick Mathewson a60d21a85d Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 
Conflicts:
	src/or/circuitbuild.c
 2013-09-04 16:08:02 -04:00
Nick Mathewson 4f3dbb3c0a use !cbt_disabled in place of LearnCBT to avoid needless circs 
This would make us do testing circuits "even when cbt is disabled by
consensus, or when we're a directory authority, or when we've failed
to write cbt history to our state file lately." (Roger's words.)

This is a fix for 9671 and an improvement in our fix for 5049.
The original misbehavior was in 0.2.2.14-alpha; the incomplete
fix was in 0.2.3.17-beta.
 2013-09-04 15:54:05 -04:00
Nick Mathewson 9b2a0f5c75 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-09-03 15:41:50 -04:00
Nick Mathewson a8e76de4d9 Merge branch 'bug9400_024_squashed' into maint-0.2.4 2013-09-03 15:38:54 -04:00
Nick Mathewson d819663b66 Avoid a double-close on one failing case of the socketpair replacement code 
Fix for bug 9400, spotted by coverity. Bug introduced in revision 2cb4f7a4
(subversion revision r389).
 2013-09-03 15:38:25 -04:00
Nick Mathewson 264aa271a7 Fix bug 9645: don't forget an md just because we can't save it. 2013-09-03 14:25:01 -04:00
Nick Mathewson eb5f22eff2 Merge remote-tracking branch 'Ryman/bug4341' 2013-09-03 13:16:22 -04:00
Nick Mathewson 824df4a08e Merge remote-tracking branch 'public/bug2767' 2013-09-03 12:37:36 -04:00
Kevin Butler 5327605caa Tougher validation for parsing urls from HTTP headers. Fixes #2767. 2013-09-03 01:14:43 +01:00
Kevin Butler 77e4a01f12 Updated openssl configuration advice for Debian 2013-09-02 19:54:50 +01:00
Kevin Butler 6e17fa6d7b Added --library-versions flag to print the compile time and runtime versions of libevent, openssl and zlib. Partially implements #6384. 2013-09-01 17:38:01 +01:00
Kevin Butler 0513643317 MyFamily option will now fix fingerprints missing their leading instead of complaining. Should fix #4341. 2013-08-31 04:49:04 +01:00
George Kadianakis 907711d790 Add a changes file for #5609. 2013-08-25 10:37:03 -04:00
Nick Mathewson 2452302354 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-08-25 00:34:23 -04:00
Nick Mathewson 8611195a00 Merge remote-tracking branch 'public/bug9546_023_v2' into maint-0.2.3 2013-08-25 00:32:27 -04:00
Nick Mathewson 4107ddd003 Merge remote-tracking branch 'public/bug9546_v2' into maint-0.2.4 2013-08-25 00:31:51 -04:00
Nick Mathewson 1ee1c8fb4f Merge remote-tracking branch 'public/bug9366' into maint-0.2.4 2013-08-25 00:29:49 -04:00
Nick Mathewson 3727a978b8 Merge remote-tracking branch 'public/bug9543' into maint-0.2.4 2013-08-25 00:29:06 -04:00
Nick Mathewson 223c7da080 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-08-22 20:47:23 -04:00
Nick Mathewson 43f187ec2e Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2013-08-22 20:47:10 -04:00
Nick Mathewson 49b8acc618 changes file for 6153 2013-08-22 10:15:56 -04:00
Nick Mathewson 2530c84220 Replace return with continue in update_consensus_networkstatus_downloads 
Fix for bug 9564; bugfix on 0.2.3.14-alpha.
 2013-08-22 10:00:37 -04:00
Nick Mathewson 71ec90fdc8 Tweak/cleanup 5526 fix. 2013-08-21 13:41:53 -04:00
Peter Retzlaff a337d4b7cb Print accounting information in heartbeat messages. 
Implements ticket 5526.
 2013-08-21 13:26:57 -04:00
Nick Mathewson af7970b6bc Add a 30-day maximum on user-supplied MaxCircuitDirtiness 
Fix for bug 9543.
 2013-08-21 11:35:00 -04:00
Nick Mathewson cbc53a2d52 Make bridges send AUTH_CHALLENGE cells 
The spec requires them to do so, and not doing so creates a situation
where they can't send-test because relays won't extend to them because
of the other part of bug 9546.

Fixes bug 9546; bugfix on 0.2.3.6-alpha.
 2013-08-21 11:29:19 -04:00
Nick Mathewson 940cef3367 Make bridges send AUTH_CHALLENGE cells 
The spec requires them to do so, and not doing so creates a situation
where they can't send-test because relays won't extend to them because
of the other part of bug 9546.

Fixes bug 9546; bugfix on 0.2.3.6-alpha.
 2013-08-21 11:28:58 -04:00
Nick Mathewson 1bb4a4f9bd Send NETINFO on receiving a NETINFO if we have not yet sent one. 
Relays previously, when initiating a connection, would only send a
NETINFO after sending an AUTHENTICATE.  But bridges, when receiving a
connection, would never send AUTH_CHALLENGE.  So relays wouldn't
AUTHENTICATE, and wouldn't NETINFO, and then bridges would be
surprised to be receiving CREATE cells on a non-open circuit.

Fixes bug 9546.
 2013-08-20 14:52:56 -04:00
Nick Mathewson 28485d33ca Merge remote-tracking branch 'origin/maint-0.2.4' 2013-08-16 22:00:14 -04:00
Nick Mathewson edaea773e5 Document the correct loglevel for the heartbeat message 2013-08-16 21:59:41 -04:00
Nick Mathewson ca6949ebea Add a changes file for 9108. 2013-08-15 15:51:56 -04:00
Nick Mathewson d4634d1b72 Merge remote-tracking branch 'majek/bug9108' 
Conflicts:
	src/or/circuitlist.h
 2013-08-15 15:36:04 -04:00
George Kadianakis 1743144c34 Add changes file for #4773. 2013-08-15 12:16:31 -04:00
Nick Mathewson 74262f1571 Merge branch 'bug5040_4773_rebase_3' 2013-08-15 12:04:56 -04:00