]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
13 years agoDocument that we are unlikely to underflow session group IDs.
Nick Mathewson [Fri, 15 Jun 2012 14:05:21 +0000 (10:05 -0400)] 
Document that we are unlikely to underflow session group IDs.

13 years agoTriage the XXX023 and XXX022 comments: postpone many.
Nick Mathewson [Fri, 15 Jun 2012 13:37:40 +0000 (09:37 -0400)] 
Triage the XXX023 and XXX022 comments: postpone many.

13 years agoDowngrade log messages about cbt enabled/disabled. Bug 6169.
Nick Mathewson [Fri, 15 Jun 2012 13:57:18 +0000 (09:57 -0400)] 
Downgrade log messages about cbt enabled/disabled. Bug 6169.

13 years agowhitespace fix
Roger Dingledine [Fri, 15 Jun 2012 08:41:57 +0000 (04:41 -0400)] 
whitespace fix

13 years agobump to 0.2.3.17-beta-dev
Roger Dingledine [Fri, 15 Jun 2012 08:29:32 +0000 (04:29 -0400)] 
bump to 0.2.3.17-beta-dev

13 years agogive 0.2.3.17-beta a release blurb tor-0.2.3.17-beta
Roger Dingledine [Fri, 15 Jun 2012 08:16:40 +0000 (04:16 -0400)] 
give 0.2.3.17-beta a release blurb

13 years agoanother little step at making debugging 5458 easier
Roger Dingledine [Fri, 15 Jun 2012 07:58:47 +0000 (03:58 -0400)] 
another little step at making debugging 5458 easier

13 years agotab-man returneth (this time using the name 'rob')
Roger Dingledine [Fri, 15 Jun 2012 07:28:18 +0000 (03:28 -0400)] 
tab-man returneth (this time using the name 'rob')

13 years agofix typos, logic error, default in man page
Roger Dingledine [Fri, 15 Jun 2012 07:25:27 +0000 (03:25 -0400)] 
fix typos, logic error, default in man page

13 years agobump to 0.2.3.17-beta
Roger Dingledine [Fri, 15 Jun 2012 07:13:00 +0000 (03:13 -0400)] 
bump to 0.2.3.17-beta

13 years agofold in next changes items
Roger Dingledine [Fri, 15 Jun 2012 07:10:07 +0000 (03:10 -0400)] 
fold in next changes items

13 years agoExpand on bug5458 changes file
Nick Mathewson [Fri, 15 Jun 2012 04:45:48 +0000 (00:45 -0400)] 
Expand on bug5458 changes file

13 years agoAdd a changes file for bug5458.
Mike Perry [Fri, 15 Jun 2012 04:31:36 +0000 (21:31 -0700)] 
Add a changes file for bug5458.

13 years agoLower the default path bias notice rate to 40%.
Mike Perry [Fri, 15 Jun 2012 04:15:08 +0000 (21:15 -0700)] 
Lower the default path bias notice rate to 40%.

I saw 72% on a test run with 26 circuits. 70% might be a little close to the
line. That, or min_circs is too low and we need to be more patient. We still
need to test/simulate more.

13 years agoFor now, never disable any guards.
Mike Perry [Wed, 13 Jun 2012 23:37:43 +0000 (16:37 -0700)] 
For now, never disable any guards.

13 years agoDefend against entry node path bias attacks
Mike Perry [Fri, 4 May 2012 03:15:34 +0000 (20:15 -0700)] 
Defend against entry node path bias attacks

The defense counts the circuit failure rate for each guard for the past N
circuits. Failure is defined as the ability to complete a first hop, but not
finish completing the circuit all the way to the exit.

If the failure rate exceeds a certain amount, a notice is emitted.

If it exceeds a greater amount, a warn is emitted and the guard is disabled.

These values are governed by consensus parameters which we intend to tune as
we perform experiments and statistical simulations.

13 years agoDocument --hush; fix documentation for --quiet.
Nick Mathewson [Thu, 14 Jun 2012 18:58:51 +0000 (14:58 -0400)] 
Document --hush; fix documentation for --quiet.

13 years agoMerge remote-tracking branch 'asn-mytor/bug5589_take2'
Nick Mathewson [Thu, 14 Jun 2012 17:05:16 +0000 (13:05 -0400)] 
Merge remote-tracking branch 'asn-mytor/bug5589_take2'

13 years agoRemove validate_pluggable_transports_config(): redundant since 9d9b5ed0.
George Kadianakis [Thu, 14 Jun 2012 15:01:22 +0000 (18:01 +0300)] 
Remove validate_pluggable_transports_config(): redundant since 9d9b5ed0.

The warning message of validate_pluggable_transports_config() is
superseded by the changes in the warning message of
connection_or_connect() when the proxy credentials can't be found.

13 years agodemote two entries that don't affect most users
Roger Dingledine [Thu, 14 Jun 2012 09:50:32 +0000 (05:50 -0400)] 
demote two entries that don't affect most users

13 years agofold in further changes files
Roger Dingledine [Thu, 14 Jun 2012 09:47:55 +0000 (05:47 -0400)] 
fold in further changes files

13 years agoMerge remote-tracking branch 'public/bug4663'
Nick Mathewson [Wed, 13 Jun 2012 21:01:53 +0000 (17:01 -0400)] 
Merge remote-tracking branch 'public/bug4663'

13 years agoMerge branch 'trac-5049-squashed'
Nick Mathewson [Wed, 13 Jun 2012 20:55:39 +0000 (16:55 -0400)] 
Merge branch 'trac-5049-squashed'

13 years agoOne more fix for bug 5049.
Nick Mathewson [Wed, 13 Jun 2012 20:42:51 +0000 (16:42 -0400)] 
One more fix for bug 5049.

13 years agoSatisfy make check-spaces
Andrea Shepard [Wed, 13 Jun 2012 02:38:28 +0000 (19:38 -0700)] 
Satisfy make check-spaces

13 years agoMove cbt->liveness.timeouts_after_firsthop free code into its own function
Andrea Shepard [Wed, 13 Jun 2012 02:27:37 +0000 (19:27 -0700)] 
Move cbt->liveness.timeouts_after_firsthop free code into its own function

13 years agoAdd change file for bug 5049
Andrea Shepard [Tue, 12 Jun 2012 19:49:03 +0000 (12:49 -0700)] 
Add change file for bug 5049

13 years agoEarly exit from circuit_build_times_set_timeout() if adaptive timeouts are disabled
Andrea Shepard [Tue, 12 Jun 2012 19:24:05 +0000 (12:24 -0700)] 
Early exit from circuit_build_times_set_timeout() if adaptive timeouts are disabled

13 years agoDon't poll to see if we need to build circuits for timeout data if LearnCircuitBuildT...
Andrea Shepard [Tue, 12 Jun 2012 19:12:06 +0000 (12:12 -0700)] 
Don't poll to see if we need to build circuits for timeout data if LearnCircuitBuildTimeout is disabled

13 years agoUse K&R style
Andrea Shepard [Wed, 13 Jun 2012 02:31:01 +0000 (19:31 -0700)] 
Use K&R style

13 years agoUnconditionally use config CircuitBuildTimeout if LearnCircuitBuildTimeout is disabled
Andrea Shepard [Tue, 12 Jun 2012 19:11:32 +0000 (12:11 -0700)] 
Unconditionally use config CircuitBuildTimeout if LearnCircuitBuildTimeout is disabled

13 years agoDon't track circuit timeout history unless we're actually using adaptive timeouts
Andrea Shepard [Tue, 12 Jun 2012 18:52:38 +0000 (11:52 -0700)] 
Don't track circuit timeout history unless we're actually using adaptive timeouts

13 years agoAdd debug logging to circuit_build_times_* of circuitbuild.c to trace queries of...
Andrea Shepard [Tue, 12 Jun 2012 03:36:38 +0000 (20:36 -0700)] 
Add debug logging to circuit_build_times_* of circuitbuild.c to trace queries of consensus parameters for bug 5049

13 years agoOnly use -Qunused-arguments when building with clang. fix on 5210 fix.
Nick Mathewson [Wed, 13 Jun 2012 20:37:23 +0000 (16:37 -0400)] 
Only use -Qunused-arguments when building with clang. fix on 5210 fix.

13 years agoMerge branch 'bug5263_023'
Nick Mathewson [Wed, 13 Jun 2012 20:23:16 +0000 (16:23 -0400)] 
Merge branch 'bug5263_023'

13 years agoAdd changes file for bug5263
Nick Mathewson [Tue, 5 Jun 2012 16:11:08 +0000 (12:11 -0400)] 
Add changes file for bug5263

13 years agoAdd rate-limited log message to bug5263 fix
Nick Mathewson [Tue, 15 May 2012 14:22:17 +0000 (10:22 -0400)] 
Add rate-limited log message to bug5263 fix

Initially I said, "I claim that we shouldn't be reading and marked;
let's see if I'm right."  But Rob finds that it does.

13 years agoFix busy Libevent loops (infinite loops in Shadow)
Rob G. Jansen [Tue, 28 Feb 2012 23:19:49 +0000 (18:19 -0500)] 
Fix busy Libevent loops (infinite loops in Shadow)

There is a bug causing busy loops in Libevent and infinite loops in
the Shadow simulator. A connection that is marked for close, wants
to flush, is held open to flush, but is rate limited (the token
bucket is empty) triggers the bug.

This commit fixes the bug. Details are below.

This currently happens on read and write callbacks when the active
socket is marked for close. In this case, Tor doesn't actually try
to complete the read or write (it returns from those methods when
marked), but instead tries to clear the connection with
conn_close_if_marked(). Tor will not close a marked connection that
contains data: it must be flushed first. The bug occurs when this
flush operation on the marked connection can not occur because the
connection is rate-limited (its write token bucket is empty).

The fix is to detect when rate limiting is preventing a marked
connection from properly flushing. In this case, it should be
flagged as read/write_blocked_on_bandwidth and the read/write events
de-registered from Libevent. When the token bucket gets refilled, it
will check the associated read/write_blocked_on_bandwidth flag, and
add the read/write event back to Libevent, which will cause it to
fire. This time, it will be properly flushed and closed.

The reason that both read and write events are both de-registered
when the marked connection can not flush is because both result in
the same behavior. Both read/write events on marked connections will
never again do any actual reads/writes, and are only useful to
trigger the flush and close the connection. By setting the
associated read/write_blocked_on_bandwidth flag, we ensure that the
event will get added back to Libevent, properly flushed, and closed.

Why is this important? Every Shadow event occurs at a discrete time
instant. If Tor does not properly deregister Libevent events that
fire but result in Tor essentially doing nothing, Libevent will
repeatedly fire the event. In Shadow this means infinite loop,
outside of Shadow this means wasted CPU cycles.

13 years agoChange smartlist_create->smartlist_new in bug4744 branch as merged to master
Nick Mathewson [Wed, 13 Jun 2012 16:16:02 +0000 (12:16 -0400)] 
Change smartlist_create->smartlist_new in bug4744 branch as merged to master

13 years agoMerge branch 'bug4744_squashed'
Nick Mathewson [Wed, 13 Jun 2012 16:09:13 +0000 (12:09 -0400)] 
Merge branch 'bug4744_squashed'

13 years agoImplement the client side of proposal 198
Nick Mathewson [Tue, 15 May 2012 19:32:18 +0000 (15:32 -0400)] 
Implement the client side of proposal 198

This is a feature removal: we no longer fake any ciphersuite other
than the not-really-standard SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA
(0xfeff).  This change will let servers rely on our actually
supporting what we claim to support, and thereby let Tor migrate to
better TLS ciphersuites.

As a drawback, Tor instances that use old openssl versions and
openssl builds with ciphers disabled will no longer give the
"firefox" cipher list.

13 years agoMerge remote-tracking branch 'public/bug3940_redux'
Nick Mathewson [Wed, 13 Jun 2012 15:40:38 +0000 (11:40 -0400)] 
Merge remote-tracking branch 'public/bug3940_redux'

13 years agoMerge remote-tracking branch 'public/bug5210'
Nick Mathewson [Wed, 13 Jun 2012 15:37:11 +0000 (11:37 -0400)] 
Merge remote-tracking branch 'public/bug5210'

13 years agoFix another clang compile warning
Sebastian Hahn [Wed, 13 Jun 2012 14:51:56 +0000 (16:51 +0200)] 
Fix another clang compile warning

We forgot this when we fixed 5969.

13 years agoMerge branch 'task-5849-3-squashed'
Nick Mathewson [Wed, 13 Jun 2012 14:13:01 +0000 (10:13 -0400)] 
Merge branch 'task-5849-3-squashed'

13 years agoFix integer overflow in cell stats spotted by atagar.
Karsten Loesing [Mon, 14 May 2012 12:30:04 +0000 (14:30 +0200)] 
Fix integer overflow in cell stats spotted by atagar.

Fixes #5849.

13 years agoMerge branch 'maint-0.2.2'
Roger Dingledine [Wed, 13 Jun 2012 07:48:43 +0000 (03:48 -0400)] 
Merge branch 'maint-0.2.2'

13 years agoUpdate to the June 2012 GeoIP database.
Karsten Loesing [Wed, 13 Jun 2012 07:21:00 +0000 (09:21 +0200)] 
Update to the June 2012 GeoIP database.

Manually removed range 0.116.0.0 to 0.119.255.255 which Maxmind says is
assigned to AT.  This is very likely a bug in their database, because
0.0.0.0/8 is a reserved range.

13 years agoAdd a warning for using HTTPProxy with no other proxy.
Nick Mathewson [Tue, 12 Jun 2012 19:21:41 +0000 (15:21 -0400)] 
Add a warning for using HTTPProxy with no other proxy.

From what I can tell, this configuration is usually a mistake, and
leads people to think that all their traffic is getting proxied when
in fact practically none of it is.  Resolves the issue behind "bug"
4663.

13 years agoforward-port the 0.2.2.37 changelog
Roger Dingledine [Tue, 12 Jun 2012 11:50:34 +0000 (07:50 -0400)] 
forward-port the 0.2.2.37 changelog

13 years agofold in changes files so far
Roger Dingledine [Tue, 12 Jun 2012 08:21:39 +0000 (04:21 -0400)] 
fold in changes files so far

13 years agofixup! An attempt at bug3940 and making AllowDotExit 0 work with MapAddress
Nick Mathewson [Tue, 12 Jun 2012 01:50:52 +0000 (21:50 -0400)] 
fixup! An attempt at bug3940 and making AllowDotExit 0 work with MapAddress

13 years agoDocument ADDRMAPSRC_NONE.
Nick Mathewson [Tue, 12 Jun 2012 01:49:08 +0000 (21:49 -0400)] 
Document ADDRMAPSRC_NONE.

13 years agoMerge branch 'bug5452'
Nick Mathewson [Mon, 11 Jun 2012 18:44:26 +0000 (14:44 -0400)] 
Merge branch 'bug5452'

13 years agoCall bug5452 fix a feature; note its trac number in the changes file
Nick Mathewson [Mon, 11 Jun 2012 18:44:08 +0000 (14:44 -0400)] 
Call bug5452 fix a feature; note its trac number in the changes file

13 years agoAdd change file for 5452
Andrea Shepard [Mon, 11 Jun 2012 18:17:59 +0000 (11:17 -0700)] 
Add change file for 5452

13 years agoMake RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT warning tell the user how to fix it.
Andrea Shepard [Mon, 11 Jun 2012 18:09:19 +0000 (11:09 -0700)] 
Make RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT warning tell the user how to fix it.

13 years agoDo not try to use -pie on windows; it appears to break badly and weirdly
Nick Mathewson [Mon, 11 Jun 2012 16:22:48 +0000 (12:22 -0400)] 
Do not try to use -pie on windows; it appears to break badly and weirdly

13 years agoRemove a couple of debugging "echo"s that snuck into configure.in
Nick Mathewson [Mon, 11 Jun 2012 15:30:43 +0000 (11:30 -0400)] 
Remove a couple of debugging "echo"s that snuck into configure.in

13 years agoMake our compiler-hardening checks robust against MinGW
Nick Mathewson [Mon, 11 Jun 2012 15:00:48 +0000 (11:00 -0400)] 
Make our compiler-hardening checks robust against MinGW

First, specify -Werror when we are testing each option; if it causes
a warning to appear, we shouldn't be adding it.

Second, do not attempt to add these options until after we have
found the libraries we want.  Previously, I would hit a bug where
the linker hardening options worked fine when we weren't linking
anything, but failed completely once we added openssl or libevent.

13 years agoMerge remote-tracking branch 'public/bug4592'
Nick Mathewson [Mon, 11 Jun 2012 14:34:48 +0000 (10:34 -0400)] 
Merge remote-tracking branch 'public/bug4592'

13 years agoMerge remote-tracking branch 'public/bug5598'
Nick Mathewson [Mon, 11 Jun 2012 14:26:48 +0000 (10:26 -0400)] 
Merge remote-tracking branch 'public/bug5598'

Conflicts:
doc/tor.1.txt

Conflict was on a formatting issue in the manpage.

13 years agoMerge branch 'bug6097'
Nick Mathewson [Mon, 11 Jun 2012 14:14:01 +0000 (10:14 -0400)] 
Merge branch 'bug6097'

13 years agoMerge branch 'bug2865'
Nick Mathewson [Mon, 11 Jun 2012 13:53:49 +0000 (09:53 -0400)] 
Merge branch 'bug2865'

13 years agoList defaults consistently in manpage
Nick Mathewson [Mon, 11 Jun 2012 13:48:46 +0000 (09:48 -0400)] 
List defaults consistently in manpage

Nearly everywhere, we end options with "(Default: foo)".  But in a
few places, we inserted an extra period after or before the close
parenthesis, and in a few other places we said "(Defaults to foo)".
Let's not do that.

13 years agoWarn if the user has set CircuitBuildTimeout stupidly low and turned off LearnCircuit...
Andrea Shepard [Sat, 9 Jun 2012 06:44:06 +0000 (23:44 -0700)] 
Warn if the user has set CircuitBuildTimeout stupidly low and turned off LearnCircuitBuildTimeout

13 years agochanges file and whitespace fix for bug5235 patch
Nick Mathewson [Fri, 8 Jun 2012 18:32:09 +0000 (14:32 -0400)] 
changes file and whitespace fix for bug5235 patch

13 years agoRate-limit 'Weighted bandwidth is 0.000000 ...' message; it can be produced in extrem...
Andrea Shepard [Fri, 8 Jun 2012 10:00:30 +0000 (03:00 -0700)] 
Rate-limit 'Weighted bandwidth is 0.000000 ...' message; it can be produced in extreme quantities

13 years agotypo noticed by "_raptor"
Roger Dingledine [Thu, 7 Jun 2012 19:35:19 +0000 (15:35 -0400)] 
typo noticed by "_raptor"

13 years agoCorrect the defaults for the *Statistics options
Nick Mathewson [Thu, 7 Jun 2012 17:46:51 +0000 (13:46 -0400)] 
Correct the defaults for the *Statistics options

13 years agoMerge remote-tracking branch 'arma/bug3886'
Nick Mathewson [Thu, 7 Jun 2012 17:30:55 +0000 (13:30 -0400)] 
Merge remote-tracking branch 'arma/bug3886'

Conflicts:
src/or/dirserv.c

13 years agoFix mingw build with -DUNICODE -D_UNICODE
Nick Mathewson [Thu, 7 Jun 2012 15:59:32 +0000 (11:59 -0400)] 
Fix mingw build with -DUNICODE -D_UNICODE

This is a very blunt fix, and mostly just turns some func() calls
into FuncA() to make things build again.  Fixes bug 6097.

13 years agoBe more careful calling wcstombs
Nick Mathewson [Thu, 17 May 2012 14:08:48 +0000 (10:08 -0400)] 
Be more careful calling wcstombs

The function is not guaranteed to NUL-terminate its output.  It
*is*, however, guaranteed not to generate more than two bytes per
multibyte character (plus terminating nul), so the general approach
I'm taking is to try to allocate enough space, AND to manually add a
NUL at the end of each buffer just in case I screwed up the "enough
space" thing.

Fixes bug 5909.

13 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Thu, 7 Jun 2012 13:46:14 +0000 (09:46 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

13 years agoapply 6abb638954b to 0.2.3.16-alpha too
Roger Dingledine [Thu, 7 Jun 2012 07:55:12 +0000 (03:55 -0400)] 
apply 6abb638954b to 0.2.3.16-alpha too

13 years agoSend a CRLF at the end of a STATUS_* event, not in the middle of it
Robert Ransom [Thu, 7 Jun 2012 03:22:06 +0000 (03:22 +0000)] 
Send a CRLF at the end of a STATUS_* event, not in the middle of it

Fixes bug 6094; bugfix on commit 3a9351b57e528b1d0bd2e72bcf78db7c91b2ff8f.

13 years agoChange the default for DynamicDHGroups to 0
Nick Mathewson [Wed, 6 Jun 2012 16:00:04 +0000 (12:00 -0400)] 
Change the default for DynamicDHGroups to 0

This feature can make Tor relays less identifiable by their use of the
mod_ssl DH group, but at the cost of some usability (#4721) and bridge
tracing (#6087) regressions.

We should try to turn this on by default again if we find that the
mod_ssl group is uncommon and/or we move to a different DH group size
(see #6088).  Before we can do so, we need a fix for bugs #6087 and

Resolves ticket #5598 for now.

13 years agouse my time machine to fix a few more typos
Roger Dingledine [Wed, 6 Jun 2012 04:30:25 +0000 (00:30 -0400)] 
use my time machine to fix a few more typos

13 years agobump to 0.2.3.16-alpha-dev
Roger Dingledine [Tue, 5 Jun 2012 22:37:19 +0000 (18:37 -0400)] 
bump to 0.2.3.16-alpha-dev

13 years agouse my time machine to fix the changelog
Roger Dingledine [Tue, 5 Jun 2012 22:36:58 +0000 (18:36 -0400)] 
use my time machine to fix the changelog

13 years agoadd a blurb for 0.2.3.16-alpha tor-0.2.3.16-alpha
Roger Dingledine [Tue, 5 Jun 2012 22:28:52 +0000 (18:28 -0400)] 
add a blurb for 0.2.3.16-alpha

13 years agotoday is the day for 0.2.3.16-alpha
Roger Dingledine [Tue, 5 Jun 2012 16:14:57 +0000 (12:14 -0400)] 
today is the day for 0.2.3.16-alpha

13 years agostart folding in the changes files
Roger Dingledine [Tue, 5 Jun 2012 16:05:31 +0000 (12:05 -0400)] 
start folding in the changes files

13 years agoMerge branch 'bug5603'
Nick Mathewson [Tue, 5 Jun 2012 15:47:34 +0000 (11:47 -0400)] 
Merge branch 'bug5603'

13 years agoChanges file for bug 5603
Nick Mathewson [Tue, 5 Jun 2012 15:47:16 +0000 (11:47 -0400)] 
Changes file for bug 5603

13 years agoMinor changes to bug5603
Nick Mathewson [Tue, 5 Jun 2012 15:39:31 +0000 (11:39 -0400)] 
Minor changes to bug5603

  * Minor stylistic changes to comments and doxygen
  * Use strcmp_opt; it already exists.
  * Tighten bridge_has_digest implementation a little.

13 years agoMerge remote-tracking branch 'public/getfilesize_64'
Nick Mathewson [Tue, 5 Jun 2012 15:10:42 +0000 (11:10 -0400)] 
Merge remote-tracking branch 'public/getfilesize_64'

Conflicts:
src/common/compat.c

The getfilesize change conflicted with the removal of file_handle
from the windows tor_mmap_t.

13 years agoFix some mingw build warnings
Nick Mathewson [Tue, 5 Jun 2012 15:06:26 +0000 (11:06 -0400)] 
Fix some mingw build warnings

These include:
   - Having a weird in_addr that can't be initialized with {0}
   - Needing INVALID_HANDLE_VALUE instead of -1 for file handles.
   - Having a weird dependent definition for struct stat.
   - pid is signed, not unsigned.

13 years agoRevert "Disable (Cell,DirReq,Entry,ExitPort)Statistics on bridges"
Nick Mathewson [Tue, 5 Jun 2012 14:47:05 +0000 (10:47 -0400)] 
Revert "Disable (Cell,DirReq,Entry,ExitPort)Statistics on bridges"

This reverts commit 981e896dd2eaf69798bb503c271306ee779dd6d2.

Apparently Karsten still needs DirReqStatistics for bridges; see

13 years agoDowngrade tor_assert(0) to tor_fragile_assert() in windows stub create_unix_sockaddr
Nick Mathewson [Tue, 5 Jun 2012 14:36:34 +0000 (10:36 -0400)] 
Downgrade tor_assert(0) to tor_fragile_assert() in windows stub create_unix_sockaddr

13 years agoMerge remote-tracking branch 'public/bug3894'
Nick Mathewson [Tue, 5 Jun 2012 14:31:00 +0000 (10:31 -0400)] 
Merge remote-tracking branch 'public/bug3894'

13 years agoMerge remote-tracking branch 'public/format_doubles'
Nick Mathewson [Tue, 5 Jun 2012 14:30:50 +0000 (10:30 -0400)] 
Merge remote-tracking branch 'public/format_doubles'

Conflicts:
src/or/geoip.c

13 years agoDisable (Cell,DirReq,Entry,ExitPort)Statistics on bridges
Nick Mathewson [Tue, 5 Jun 2012 14:25:50 +0000 (10:25 -0400)] 
Disable (Cell,DirReq,Entry,ExitPort)Statistics on bridges

These stats are currently discarded, but we might as well
hard-disable them on bridges, to be clean.

Fix for bug 5824; bugfix on 0.2.1.17-rc.

Patch originally by Karsten Loesing.

13 years agoMerge remote-tracking branch 'public/bug4657'
Nick Mathewson [Tue, 5 Jun 2012 14:20:44 +0000 (10:20 -0400)] 
Merge remote-tracking branch 'public/bug4657'

Conflicts:
src/or/router.c

13 years agoMerge remote-tracking branch 'public/bug4710'
Nick Mathewson [Tue, 5 Jun 2012 14:16:28 +0000 (10:16 -0400)] 
Merge remote-tracking branch 'public/bug4710'

13 years agoFix "make check-spaces" issues
Nick Mathewson [Tue, 5 Jun 2012 04:49:18 +0000 (00:49 -0400)] 
Fix "make check-spaces" issues

13 years agoResolve about 24 DOCDOCs
Nick Mathewson [Tue, 5 Jun 2012 04:17:54 +0000 (00:17 -0400)] 
Resolve about 24 DOCDOCs

13 years agoMissing copyright/license statement for procmon.c
Nick Mathewson [Tue, 5 Jun 2012 01:02:13 +0000 (21:02 -0400)] 
Missing copyright/license statement for procmon.c

13 years agoUpdate copyright dates to 2012; add a few missing copyright statements
Nick Mathewson [Tue, 5 Jun 2012 00:58:17 +0000 (20:58 -0400)] 
Update copyright dates to 2012; add a few missing copyright statements

13 years agoAdd about 60 more DOCDOC comments to 0.2.3
Nick Mathewson [Mon, 4 Jun 2012 23:51:00 +0000 (19:51 -0400)] 
Add about 60 more DOCDOC comments to 0.2.3

Also, try to resolve some doxygen issues.  First, define a magic
"This is doxygen!" macro so that we take the correct branch in
various #if/#else/#endifs in order to get the right documentation.
Second, add in a few grouping @{ and @} entries in order to get some
variables and fields to get grouped together.