Nick Mathewson 7b4b137dc9 Merge remote-tracking branch 'public/bug9229_025' ... Conflicts: src/or/entrynodes.c		2014-04-23 11:00:49 -04:00
..
11543	Improved message when running sandbox on Linux without libseccomp	2014-04-18 14:54:27 -04:00
bug9229_025	Fix our check for the "first" bridge descriptor.	2014-03-10 15:11:21 -04:00
bug9963	Log descriptor-download bootstrapping messages less verbosely	2014-03-27 11:23:53 -04:00
ticket11528	Elevate server TLS cipher preferences over client	2014-04-17 10:33:04 -04:00