Nick Mathewson fa1d47293b Merge remote-tracking branch 'origin/maint-0.2.2' ...

The conflicts were mainly caused by the routerinfo->node transition.

Conflicts:
	src/or/circuitbuild.c
	src/or/command.c
	src/or/connection_edge.c
	src/or/directory.c
	src/or/dirserv.c
	src/or/relay.c
	src/or/rendservice.c
	src/or/routerlist.c

2011-05-30 15:41:46 -04:00

..

bug1297a

Use the normal four-hop CBT for client intro circuits

2011-05-30 12:24:51 -04:00

bug1345

Handle transitions in Automap*, VirtualAddrNetwork correctly

2011-05-13 16:59:31 -04:00

bug1352

Rate-limit v2 networkstatus download fail warnings

2011-04-28 21:25:24 -04:00

bug1810

Don't recreate descriptor on sighup

2011-05-21 16:08:21 -04:00

bug2503

Add changes file for bug2503

2011-05-12 18:49:28 -04:00

bug2574

Fix typo in changes/bug2574. Thanks, rransom

2011-05-28 02:13:04 -04:00

bug2732-simple

Accept hs descriptors even if we don't see an HSDir for us

2011-05-12 00:53:07 -04:00

bug2752

Add credit to bug2752; correct the issue number in the changes file

2011-05-17 19:50:52 -04:00

bug2792_checkdir

Check permissions on the directory holding a control socket

2011-05-15 20:20:29 -04:00

bug2850

Set SO_REUSEADDR on all sockets, not just listeners

2011-05-03 22:22:20 -04:00

bug2972

Clean up the 2972 implementation a little

2011-05-15 20:20:28 -04:00

bug3019

Preserve bridge download status across SETCONF, HUP

2011-05-15 20:13:44 -04:00

bug3022

Only authorities should automatically download v2 networkstatus documents

2011-04-28 21:06:07 -04:00

bug3026

bug 3026: do not upload our vote to ourself

2011-05-12 00:47:00 -04:00

bug3045

changes file for bug3045

2011-05-15 22:02:24 -04:00

bug3118

Link to libevent_openssl statically when requested

2011-05-06 15:38:32 +02:00

bug3122_memcmp

Add a data-independent variant of memcmp and a d-i memeq function.

2011-05-11 16:12:33 -04:00

bug3135

Fix crash when read_file_to_string() fails in SAVECONF

2011-05-11 22:05:41 -04:00

bug3175

Increase the length of the buffer in smartlist_string_num_isin().

2011-05-15 22:13:53 -04:00

bug3183

Add a changes file for bug3183.

2011-05-15 11:08:46 -04:00

bug3198

refetch bridge descriptors in a timely fashion

2011-05-17 20:48:46 -04:00

bug3200

discard circuits when we change our bridge configuration

2011-05-17 21:13:59 -04:00

bug3207

Check onion keys in microdescriptors, too

2011-05-17 19:39:00 -04:00

bug3208

Fix GCC 4.6's new -Wunused-but-set-variable warnings.

2011-05-23 17:04:38 -04:00

bug3213

Handle NULL argument to get_configured_bridge_by_addr_port_digest

2011-05-17 19:46:47 -04:00

bug3228

Reinit keys at the start of options_act().

2011-05-30 12:41:46 -04:00

bug3252

log the reason for publishing a new relay descriptor

2011-05-19 23:59:52 -04:00

bug3270

Use a 64-bit type to hold sockets on win64.

2011-05-23 00:17:48 -04:00

check-fetched-rend-desc-service-id

Check fetched rendezvous descriptors' service IDs

2011-05-16 14:07:24 -04:00

check-public-key-exponents

Require that certain public keys have public exponent 65537

2011-05-16 14:28:46 -04:00

dirvote_null_deref

Fix potential null pointer deref during dirvote

2011-05-09 13:19:46 -04:00

exit-policy-default-is-not-a-prefix

Fix trailing asterisk in the output of "GETINFO info/names"

2011-05-20 08:25:42 -07:00

feature3049

Add changes file for #3049

2011-05-20 08:25:43 -07:00

feature3076

Add a ControlPortFileGroupWritable option

2011-05-13 10:41:29 -04:00

geoip-may2011

Update to the May 1 2011 Maxmind GeoLite Country database

2011-05-10 23:04:11 -04:00

md_cache_replace

Unmap microdesc cache before replacing it.

2011-05-12 11:19:52 -04:00

mdesc_null_deref

Fix a potential null deref when rebuilding md cache

2011-05-09 13:19:45 -04:00

microdesc_use

Code to make clients fetch and use microdescriptors for circuit building

2011-05-05 20:54:12 -04:00