Roger Dingledine b350ac0860 Merge branch 'maint-0.2.4' into maint-0.2.5 ... Conflicts: src/or/or.h		2014-07-25 12:15:47 -04:00
..
bufferevent_compilation	update changes entry with info for 11578 patch	2014-07-21 14:00:10 -04:00
bug8387	Fix a bug where streams would linger forever when we had no dirinfo	2014-07-09 16:15:05 -04:00
bug12602	Fix compilation with no-compression OpenSSL builds and forks	2014-07-17 11:25:56 +02:00
curve25519-donna32-bug	Put the bug number and correct credits in the changes file for the new curve25519-donna32	2014-07-23 21:25:53 -04:00
further-12184-diagnostic	diagnostic for 12184: Add a call to channel_dump_statistics	2014-07-16 10:34:39 +02:00
geoip6-july2014	Update geoip6 to the July 10 2014 database.	2014-07-18 16:31:25 +02:00
geoip-july2014	Update geoip to the July 10 2014 database.	2014-07-18 16:28:50 +02:00
prop221	Implement proposal 221: Stop sending CREATE_FAST	2014-07-25 11:59:00 -04:00
ticket12688	add a NumDirectoryGuards consensus param too	2014-07-24 16:19:47 -04:00
ticket12690	Raise guard threshold to top 25% or 2000 kilounits	2014-07-24 16:24:17 -04:00