Nick Mathewson 3a2e25969f Merge remote-tracking branch 'public/ticket6799_024_v2_squashed' ...

Conflicts:
	src/or/channel.c
	src/or/circuitlist.c
	src/or/connection.c

Conflicts involved removal of next_circ_id and addition of
unusable-circid tracking.

2014-06-11 11:57:56 -04:00

..

bug6799

Tweak changes entry for 6799

2014-06-11 11:52:58 -04:00

bug10405

fix #10405's changes file

2014-06-02 02:32:59 -04:00

bug10616

Add changes file for bug10616

2014-06-03 14:41:51 -07:00

bug11970

sandbox: revamp sandbox_getaddrinfo cacheing

2014-05-22 17:39:36 -04:00

bug12169_simple

Use uint32 !=, not tor_memneq, for relay cell integrity checking

2014-06-01 14:05:10 -04:00

bug12170

Avoid needless router_dir_info_has_changed from router_set_status

2014-06-02 00:45:15 -04:00

bug12195

Fix ancient code that only checked circ_id, not circ_id and chan

2014-06-03 18:19:08 -04:00

bug12227

Avoid illegal read off end of an array in prune_v2_cipher_list

2014-06-10 11:11:47 -04:00

geoip6-june2014

Fix changes file for geoip

2014-06-10 21:08:44 -04:00

more_8387_diagnosis

Improved diagnostic log for bug 8387.

2014-06-10 12:04:06 -04:00

not_bug_8093

put the right trac ticket number in changes file

2014-06-04 12:28:15 -04:00