]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
14 years agoadd a blurb for 0.2.2.30-rc tor-0.2.2.30-rc
Roger Dingledine [Thu, 7 Jul 2011 22:33:02 +0000 (18:33 -0400)] 
add a blurb for 0.2.2.30-rc

14 years agobump to 0.2.2.30-rc
Roger Dingledine [Thu, 7 Jul 2011 17:49:31 +0000 (13:49 -0400)] 
bump to 0.2.2.30-rc

14 years agofold in new changes entries
Roger Dingledine [Thu, 7 Jul 2011 17:41:38 +0000 (13:41 -0400)] 
fold in new changes entries

14 years agoremove changes file i'd already merged in (oops)
Roger Dingledine [Thu, 7 Jul 2011 17:35:26 +0000 (13:35 -0400)] 
remove changes file i'd already merged in (oops)

14 years agoMerge branch 'maint-0.2.2' into release-0.2.2
Roger Dingledine [Thu, 7 Jul 2011 17:29:19 +0000 (13:29 -0400)] 
Merge branch 'maint-0.2.2' into release-0.2.2

14 years agoMerge branch 'maint-0.2.1' into maint-0.2.2
Roger Dingledine [Thu, 7 Jul 2011 17:29:02 +0000 (13:29 -0400)] 
Merge branch 'maint-0.2.1' into maint-0.2.2

14 years agoupdate to the july 2011 geoip db
Roger Dingledine [Thu, 7 Jul 2011 17:28:36 +0000 (13:28 -0400)] 
update to the july 2011 geoip db

14 years agoMerge branch 'maint-0.2.2' into release-0.2.2
Roger Dingledine [Thu, 7 Jul 2011 17:26:50 +0000 (13:26 -0400)] 
Merge branch 'maint-0.2.2' into release-0.2.2

14 years agoCorrectly send a SUCCEEDED event for rdns requests
Sebastian Hahn [Thu, 7 Jul 2011 03:27:20 +0000 (05:27 +0200)] 
Correctly send a SUCCEEDED event for rdns requests

The issue was that we overlooked the possibility of reverse DNS success
at the end of connection_ap_handshake_socks_resolved(). Issue discovered
by katmagic, thanks!

14 years agoFix weird formatting of html manpage
Sebastian Hahn [Wed, 6 Jul 2011 08:38:01 +0000 (10:38 +0200)] 
Fix weird formatting of html manpage

Asciidoc was inserting <pre> tags for paragraphs that started with a
'+' at the beginning of the line. Instead, we need a space in front of
the plus.

14 years agoMerge branch 'maint-0.2.2' into release-0.2.2
Roger Dingledine [Wed, 6 Jul 2011 04:48:45 +0000 (00:48 -0400)] 
Merge branch 'maint-0.2.2' into release-0.2.2

14 years agoappease check-spaces
Roger Dingledine [Wed, 6 Jul 2011 04:48:22 +0000 (00:48 -0400)] 
appease check-spaces

14 years agoprepare for tomorrow's release candidate
Roger Dingledine [Wed, 6 Jul 2011 04:45:24 +0000 (00:45 -0400)] 
prepare for tomorrow's release candidate

14 years agoMerge branch 'maint-0.2.2' into release-0.2.2
Roger Dingledine [Wed, 6 Jul 2011 04:13:47 +0000 (00:13 -0400)] 
Merge branch 'maint-0.2.2' into release-0.2.2

14 years agoMerge remote-tracking branch 'rransom-tor/bug3465-022' into maint-0.2.2
Nick Mathewson [Tue, 5 Jul 2011 19:52:11 +0000 (15:52 -0400)] 
Merge remote-tracking branch 'rransom-tor/bug3465-022' into maint-0.2.2

14 years agoMerge branch 'cov217_022_squashed' into maint-0.2.2
Nick Mathewson [Fri, 1 Jul 2011 16:56:14 +0000 (12:56 -0400)] 
Merge branch 'cov217_022_squashed' into maint-0.2.2

14 years agoUse strlcpy when copying node IDs into measured_bw_line_t
Nick Mathewson [Fri, 1 Jul 2011 16:14:44 +0000 (12:14 -0400)] 
Use strlcpy when copying node IDs into measured_bw_line_t

We were using strncpy before, which isn't our style for stuff like
this.

This isn't a bug, though: before calling strncpy, we were checking
that strlen(src) was indeed == HEX_DIGEST_LEN, which is less than
sizeof(dst), so there was no way we could fail to NUL-terminate.
Still, strncpy(a,b,sizeof(a)) is an idiom that we ought to squash
everyplace.

Fixes CID #427.

14 years agoMerge branch 'cid30_changelog' into maint-0.2.2
Nick Mathewson [Fri, 1 Jul 2011 16:55:27 +0000 (12:55 -0400)] 
Merge branch 'cid30_changelog' into maint-0.2.2

14 years agoMerge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
Nick Mathewson [Fri, 1 Jul 2011 16:55:23 +0000 (12:55 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

14 years agoMerge branches 'cov217_021' and 'cid_450' into maint-0.2.1
Nick Mathewson [Fri, 1 Jul 2011 16:54:51 +0000 (12:54 -0400)] 
Merge branches 'cov217_021' and 'cid_450' into maint-0.2.1

14 years agoUse strlcpy in create_unix_sockaddr()
Nick Mathewson [Fri, 1 Jul 2011 16:06:54 +0000 (12:06 -0400)] 
Use strlcpy in create_unix_sockaddr()

Using strncpy meant that if listenaddress were ever >=
sizeof(sockaddr_un.sun_path), we would fail to nul-terminate
sun_path.  This isn't a big deal: we never read sun_path, and the
kernel is smart enough to reject the sockaddr_un if it isn't
nul-terminated.  Nonetheless, it's a dumb failure mode.  Instead, we
should reject addresses that don't fit in sockaddr_un.sun_path.

Coverity found this; it's CID 428.  Bugfix on 0.2.0.3-alpha.

14 years agoFix a rare memory leak in rend_cache_store
Nick Mathewson [Fri, 1 Jul 2011 15:52:39 +0000 (11:52 -0400)] 
Fix a rare memory leak in rend_cache_store

When we rejected a descriptor for not being the one we wanted, we
were letting the parsed descriptor go out of scope.

Found by Coverity; CID # 30.

Bugfix on 0.2.1.26.

(No changes file yet, since this is not in any 0.2.1.x release.)

14 years agoAdd a changelog entry for cid30 fix.
Nick Mathewson [Fri, 1 Jul 2011 16:46:26 +0000 (12:46 -0400)] 
Add a changelog entry for cid30 fix.

14 years agoFix insanely large stack_allocation in log_credential_status
Nick Mathewson [Fri, 1 Jul 2011 16:36:33 +0000 (12:36 -0400)] 
Fix insanely large stack_allocation in log_credential_status

I'm not one to insist on C's miserly stack limits, but allocating a
256K array on the stack is too much even for me.

Bugfix on 0.2.1.7-alpha.  Found by coverity.  Fixes CID # 450.

14 years agoAdd BUILDTIMEOUT_SET to the result of GETINFO events/names
Robert Ransom [Sat, 25 Jun 2011 22:02:11 +0000 (15:02 -0700)] 
Add BUILDTIMEOUT_SET to the result of GETINFO events/names

14 years agoCorrect a comment
Robert Ransom [Fri, 24 Jun 2011 22:12:45 +0000 (15:12 -0700)] 
Correct a comment

14 years agoFix minor comment issues
Robert Ransom [Thu, 23 Jun 2011 22:10:11 +0000 (15:10 -0700)] 
Fix minor comment issues

14 years agoImprove documentation of smartlist_split_string
Robert Ransom [Wed, 22 Jun 2011 20:47:32 +0000 (13:47 -0700)] 
Improve documentation of smartlist_split_string

14 years agoFix minor comment issues
Robert Ransom [Sun, 19 Jun 2011 08:28:40 +0000 (01:28 -0700)] 
Fix minor comment issues

14 years agoFix comment typo
Robert Ransom [Sun, 19 Jun 2011 08:25:51 +0000 (01:25 -0700)] 
Fix comment typo

14 years agoadd a blurb for 0.2.2.29-beta
Roger Dingledine [Tue, 21 Jun 2011 05:18:20 +0000 (01:18 -0400)] 
add a blurb for 0.2.2.29-beta

14 years agoexplain that the ./publish should happen soon after the scp
Roger Dingledine [Tue, 21 Jun 2011 04:37:18 +0000 (00:37 -0400)] 
explain that the ./publish should happen soon after the scp

otherwise you scp a tarball up but only one version of the website has it.

14 years agoMerge branch 'maint-0.2.2' into release-0.2.2 tor-0.2.2.29-beta
Roger Dingledine [Tue, 21 Jun 2011 03:50:29 +0000 (23:50 -0400)] 
Merge branch 'maint-0.2.2' into release-0.2.2

14 years agoFix overwide lines in util.c
Nick Mathewson [Mon, 20 Jun 2011 19:28:06 +0000 (15:28 -0400)] 
Fix overwide lines in util.c

14 years agobump to 0.2.2.29-beta
Roger Dingledine [Mon, 20 Jun 2011 08:03:28 +0000 (04:03 -0400)] 
bump to 0.2.2.29-beta

14 years agofold in the changes files
Roger Dingledine [Mon, 20 Jun 2011 07:58:08 +0000 (03:58 -0400)] 
fold in the changes files

14 years agoMerge branch 'maint-0.2.2' into release-0.2.2
Roger Dingledine [Mon, 20 Jun 2011 01:03:44 +0000 (21:03 -0400)] 
Merge branch 'maint-0.2.2' into release-0.2.2

14 years agoTweak bug2355_revert at suggestion from Roger
Nick Mathewson [Mon, 20 Jun 2011 00:58:46 +0000 (20:58 -0400)] 
Tweak bug2355_revert at suggestion from Roger

14 years agoAdd changes file for bug2355 revert
Nick Mathewson [Fri, 17 Jun 2011 20:54:31 +0000 (16:54 -0400)] 
Add changes file for bug2355 revert

14 years agoRevert "Add an "auto" option to UseBridges"
Nick Mathewson [Fri, 17 Jun 2011 20:45:53 +0000 (16:45 -0400)] 
Revert "Add an "auto" option to UseBridges"

This reverts commit 507c1257a4d9c629fefc2adbad8db73607749734.

14 years agoRevert "Update man page for new UseBridges tristate behaviour."
Nick Mathewson [Fri, 17 Jun 2011 20:45:23 +0000 (16:45 -0400)] 
Revert "Update man page for new UseBridges tristate behaviour."

This reverts commit 40cfad1b5ae90b06eb74861a4fdc1310f8611111.

14 years agoMerge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
Nick Mathewson [Fri, 17 Jun 2011 19:24:23 +0000 (15:24 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

14 years agoAbandon rendezvous circuits on SIGNAL NEWNYM
Robert Ransom [Fri, 10 Jun 2011 02:56:40 +0000 (19:56 -0700)] 
Abandon rendezvous circuits on SIGNAL NEWNYM

14 years agoMerge branch 'bug3407' into maint-0.2.2
Nick Mathewson [Fri, 17 Jun 2011 18:59:39 +0000 (14:59 -0400)] 
Merge branch 'bug3407' into maint-0.2.2

14 years agoMake send_control_event_impl's behaviour sane
Robert Ransom [Thu, 16 Jun 2011 10:39:37 +0000 (03:39 -0700)] 
Make send_control_event_impl's behaviour sane

14 years agoFix comment typo
Robert Ransom [Thu, 16 Jun 2011 09:57:58 +0000 (02:57 -0700)] 
Fix comment typo

14 years agoMake connection_printf_to_buf's behaviour sane
Robert Ransom [Thu, 16 Jun 2011 04:16:44 +0000 (21:16 -0700)] 
Make connection_printf_to_buf's behaviour sane

14 years agolog when we finish ssl handshake and move to renegotiation
Roger Dingledine [Fri, 17 Jun 2011 07:31:59 +0000 (03:31 -0400)] 
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.

14 years agoMerge remote-tracking branch 'public/bug3369' into maint-0.2.2
Nick Mathewson [Tue, 14 Jun 2011 17:46:10 +0000 (13:46 -0400)] 
Merge remote-tracking branch 'public/bug3369' into maint-0.2.2

14 years agoAdd changes file for bug3393
Nick Mathewson [Tue, 14 Jun 2011 17:45:12 +0000 (13:45 -0400)] 
Add changes file for bug3393

14 years agoMake ControlSocketsGroupWritable work with User.
Jérémy Bobbio [Tue, 14 Jun 2011 16:18:32 +0000 (12:18 -0400)] 
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)

14 years agochangelog entry for bug3369
Nick Mathewson [Mon, 13 Jun 2011 17:42:00 +0000 (13:42 -0400)] 
changelog entry for bug3369

14 years agoclient-side DNS proxy server: reply NOTIMPL to unsupported queries
intrigeri [Sun, 12 Jun 2011 09:57:31 +0000 (11:57 +0200)] 
client-side DNS proxy server: reply NOTIMPL to unsupported queries

Fix for bug 3369.

14 years agoFix a rare memleak during stats writing
Sebastian Hahn [Wed, 8 Jun 2011 19:35:26 +0000 (21:35 +0200)] 
Fix a rare memleak during stats writing

If rep_hist_buffer_stats_write() was called unitinitalized, we'd leak
memory.

14 years agoDon't use signed 1-bit bitfields
Sebastian Hahn [Wed, 8 Jun 2011 19:27:32 +0000 (21:27 +0200)] 
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.

14 years agoComment out some obviously dead code.
Sebastian Hahn [Wed, 8 Jun 2011 19:23:05 +0000 (21:23 +0200)] 
Comment out some obviously dead code.

Coverity warned about it, it's harmless to comment out.

14 years agoRemove a few dead assignments during router parsing
Sebastian Hahn [Wed, 8 Jun 2011 19:16:11 +0000 (21:16 +0200)] 
Remove a few dead assignments during router parsing

14 years agoCheck some more return values in unit tests
Sebastian Hahn [Wed, 8 Jun 2011 19:06:01 +0000 (21:06 +0200)] 
Check some more return values in unit tests

14 years agoremove some dead code, found by coverity
Sebastian Hahn [Wed, 8 Jun 2011 18:02:16 +0000 (20:02 +0200)] 
remove some dead code, found by coverity

14 years agoMerge branch 'bug3306_nm_squashed' into maint-0.2.2
Nick Mathewson [Mon, 6 Jun 2011 20:18:24 +0000 (16:18 -0400)] 
Merge branch 'bug3306_nm_squashed' into maint-0.2.2

14 years agoDetect insanely large circuit build state; don't give its length to rand_int
Nick Mathewson [Wed, 1 Jun 2011 16:12:01 +0000 (12:12 -0400)] 
Detect insanely large circuit build state; don't give its length to rand_int

14 years agoCheck maximum properly in crypto_rand_int()
Nick Mathewson [Wed, 1 Jun 2011 15:48:39 +0000 (11:48 -0400)] 
Check maximum properly in crypto_rand_int()

George Kadianakis notes that if you give crypto_rand_int() a value
above INT_MAX, it can return a negative number, which is not what
the documentation would imply.

The simple solution is to assert that the input is in [1,INT_MAX+1].
If in the future we need a random-value function that can return
values up to UINT_MAX, we can add one.

Fixes bug 3306; bugfix on 0.2.2pre14.

14 years agoMerge branch 'maint-0.2.1' into maint-0.2.2
Roger Dingledine [Sun, 5 Jun 2011 15:13:50 +0000 (11:13 -0400)] 
Merge branch 'maint-0.2.1' into maint-0.2.2

14 years agomove to the june 1 2011 maxmind geoip db
Roger Dingledine [Sun, 5 Jun 2011 15:12:28 +0000 (11:12 -0400)] 
move to the june 1 2011 maxmind geoip db

14 years agoput the release blurb in
Roger Dingledine [Sun, 5 Jun 2011 05:43:28 +0000 (01:43 -0400)] 
put the release blurb in

14 years agoprepare for tomorrow's release tor-0.2.2.28-beta
Roger Dingledine [Fri, 3 Jun 2011 21:43:09 +0000 (17:43 -0400)] 
prepare for tomorrow's release

14 years agowhoops
Roger Dingledine [Fri, 3 Jun 2011 21:41:06 +0000 (17:41 -0400)] 
whoops

14 years agofold in latest changes files
Roger Dingledine [Fri, 3 Jun 2011 21:35:04 +0000 (17:35 -0400)] 
fold in latest changes files

14 years agoMerge branch 'maint-0.2.2' into release-0.2.2
Roger Dingledine [Fri, 3 Jun 2011 19:25:54 +0000 (15:25 -0400)] 
Merge branch 'maint-0.2.2' into release-0.2.2

14 years agoMerge branch 'bug3318c' into maint-0.2.2
Nick Mathewson [Fri, 3 Jun 2011 15:34:32 +0000 (11:34 -0400)] 
Merge branch 'bug3318c' into maint-0.2.2

14 years agoReject 128-byte keys that are not 1024-bit
Nick Mathewson [Thu, 2 Jun 2011 16:32:59 +0000 (12:32 -0400)] 
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.

14 years agoMerge remote-tracking branch 'rransom/bug2748-v2' into maint-0.2.2
Nick Mathewson [Fri, 3 Jun 2011 15:16:48 +0000 (11:16 -0400)] 
Merge remote-tracking branch 'rransom/bug2748-v2' into maint-0.2.2

14 years agoChanges file for bug2355.
Nick Mathewson [Tue, 31 May 2011 03:49:16 +0000 (23:49 -0400)] 
Changes file for bug2355.

14 years agoUpdate man page for new UseBridges tristate behaviour.
anonym [Mon, 30 May 2011 21:52:02 +0000 (23:52 +0200)] 
Update man page for new UseBridges tristate behaviour.

14 years agoAdd an "auto" option to UseBridges
Nick Mathewson [Tue, 31 May 2011 03:32:38 +0000 (23:32 -0400)] 
Add an "auto" option to UseBridges

UseBridges 1 now means "connect only to bridges; if you know no
bridges, don't make connections."  UseBridges auto means "Use bridges
if they are known, and we have no EntryNodes set, and we aren't a
server."  UseBridges 0 means "don't use bridges."

14 years agoMerge remote-tracking branch 'rransom-tor/bug3309' into maint-0.2.2
Nick Mathewson [Thu, 2 Jun 2011 19:06:04 +0000 (15:06 -0400)] 
Merge remote-tracking branch 'rransom-tor/bug3309' into maint-0.2.2

14 years agoMerge remote-tracking branch 'arma/bug3321' into maint-0.2.2
Nick Mathewson [Thu, 2 Jun 2011 16:55:56 +0000 (12:55 -0400)] 
Merge remote-tracking branch 'arma/bug3321' into maint-0.2.2

14 years agoFix unit test failure in dir/formats
Sebastian Hahn [Thu, 2 Jun 2011 11:30:32 +0000 (13:30 +0200)] 
Fix unit test failure in dir/formats

options->DirPort is 0 in the unit tests, so
router_get_advertised_dir_port() would return 0 so we wouldn't pick a
dirport. This isn't what we want for the unit tests. Fixes bug
introduced in 95ac3ea5946.

14 years agoAdd info-level log messages during HS-client-state purge
Robert Ransom [Thu, 2 Jun 2011 10:07:09 +0000 (03:07 -0700)] 
Add info-level log messages during HS-client-state purge

I hope these will never be useful, but having them and not needing them is
better than needing them and not having them.

14 years agoRefactor HS client state-clearing code into a separate function
Robert Ransom [Thu, 2 Jun 2011 09:57:29 +0000 (02:57 -0700)] 
Refactor HS client state-clearing code into a separate function

14 years agoClear last_hid_serv_requests on SIGNAL NEWNYM
Robert Ransom [Thu, 2 Jun 2011 09:46:04 +0000 (02:46 -0700)] 
Clear last_hid_serv_requests on SIGNAL NEWNYM

Fixes bug #3309.

14 years agoMake last_hid_serv_requests functions less fragile
Robert Ransom [Thu, 2 Jun 2011 09:24:18 +0000 (02:24 -0700)] 
Make last_hid_serv_requests functions less fragile

Previously, Tor would dereference a NULL pointer and crash if
lookup_last_hid_serv_request were called before the first call to
directory_clean_last_hid_serv_requests.  As far as I can tell, that's
currently impossible, but I want that undocumented invariant to go away
in case I^Wwe break it someday.

14 years agoFix compile error in procmon.c
Gisle [Wed, 1 Jun 2011 15:11:12 +0000 (11:11 -0400)] 
Fix compile error in procmon.c

An elusive compile-error (MingW-gcc v4.50 on Win_XP); a missing
comma (!) and a typo ('err_msg' at line 277 changed to 'errmsg').
Aso changed the format for 'err_code' at line 293 into a "%ld" to suppress
a warning. How did this go unnoticed for ~1 month? Btw. This is my 1st ever
'git commit', so it better work.

14 years agoReport wrong key sizes correctly
Nick Mathewson [Wed, 1 Jun 2011 15:07:08 +0000 (11:07 -0400)] 
Report wrong key sizes correctly

When we introduced NEED_KEY_1024 in routerparse.c back in
0.2.0.1-alpha, I forgot to add a *8 when logging the length of a
bad-length key.

Bugfix for 3318 on 0.2.0.1-alpha.

14 years agofix a bridge edge case similar to 2511
Roger Dingledine [Wed, 1 Jun 2011 00:43:55 +0000 (20:43 -0400)] 
fix a bridge edge case similar to 2511

If you had configured a bridge but then switched to a different bridge
via the controller, you would still be willing to use the old one.

14 years agostop asserting at boot
Roger Dingledine [Tue, 31 May 2011 03:50:37 +0000 (23:50 -0400)] 
stop asserting at boot

The patch for 3228 made us try to run init_keys() before we had loaded
our state file, resulting in an assert inside init_keys. We had moved
it too early in the function.

Now it's later in the function, but still above the accounting calls.

14 years agofold in some more changes entries
Roger Dingledine [Tue, 31 May 2011 01:03:14 +0000 (21:03 -0400)] 
fold in some more changes entries

14 years agoMerge branch 'maint-0.2.2' into release-0.2.2
Roger Dingledine [Mon, 30 May 2011 20:20:18 +0000 (16:20 -0400)] 
Merge branch 'maint-0.2.2' into release-0.2.2

14 years agoMerge branch 'bug3216_v2' into maint-0.2.2
Nick Mathewson [Mon, 30 May 2011 20:12:53 +0000 (16:12 -0400)] 
Merge branch 'bug3216_v2' into maint-0.2.2

14 years agoMerge branch 'bug3289' into maint-0.2.2
Nick Mathewson [Mon, 30 May 2011 19:50:35 +0000 (15:50 -0400)] 
Merge branch 'bug3289' into maint-0.2.2

14 years agoWarn when two hs use the same directory
Sebastian Hahn [Sat, 28 May 2011 22:54:59 +0000 (00:54 +0200)] 
Warn when two hs use the same directory

This simple implementation has a few issues, but it should do for
0.2.2.x. We will want to revisit this later and make it smarter.

14 years agominor cleanups while reviewing 3216
Roger Dingledine [Mon, 30 May 2011 19:31:06 +0000 (15:31 -0400)] 
minor cleanups while reviewing 3216

14 years agowhitespace fixes
Nick Mathewson [Mon, 30 May 2011 19:21:06 +0000 (15:21 -0400)] 
whitespace fixes

14 years agoMerge branch 'bug3045' into maint-0.2.2
Nick Mathewson [Mon, 30 May 2011 19:18:59 +0000 (15:18 -0400)] 
Merge branch 'bug3045' into maint-0.2.2

Conflicts:
src/or/circuitbuild.c

14 years agoImprove comments and defensive programming for 3045
Nick Mathewson [Mon, 30 May 2011 19:15:10 +0000 (15:15 -0400)] 
Improve comments and defensive programming for 3045

The comment fixes are trivial.  The defensive programming trick is to
tolerate receiving NULL inputs on the describe functions. That should
never actually happen, but it seems like the likeliest mistake for us
to make in the future.

14 years agoMerge remote-tracking branch 'public/bug3270' into maint-0.2.2
Nick Mathewson [Mon, 30 May 2011 18:49:49 +0000 (14:49 -0400)] 
Merge remote-tracking branch 'public/bug3270' into maint-0.2.2

14 years agoMerge branch 'bug3228_squashed' into maint-0.2.2
Nick Mathewson [Mon, 30 May 2011 16:42:08 +0000 (12:42 -0400)] 
Merge branch 'bug3228_squashed' into maint-0.2.2

14 years agoReinit keys at the start of options_act().
Nick Mathewson [Mon, 23 May 2011 20:38:35 +0000 (16:38 -0400)] 
Reinit keys at the start of options_act().

Previously we did this nearer to the end (in the old_options &&
transition_affects_workers() block).  But other stuff cares about
keys being consistent with options... particularly anything which
tries to access a key, which can die in assert_identity_keys_ok().

Fixes bug 3228; bugfix on 0.2.2.18-alpha.

14 years agoMerge branch 'bug1297a' into maint-0.2.2
Nick Mathewson [Mon, 30 May 2011 16:25:07 +0000 (12:25 -0400)] 
Merge branch 'bug1297a' into maint-0.2.2

14 years agoUse the normal four-hop CBT for client intro circuits
Robert Ransom [Sun, 29 May 2011 15:21:43 +0000 (08:21 -0700)] 
Use the normal four-hop CBT for client intro circuits

Fixes another part of bug 1297.