Nick Mathewson 5b55e0e181 Merge remote-tracking branch 'public/no_itime_queue' ... The conflicts here were tricky, and required me to eliminate the command-queue as well. That wasn't so hard. Conflicts: src/or/or.h src/or/relay.c		2014-02-10 15:04:23 -05:00
..
common	Explain CURVE25519_ENABLED: closes 9774	2014-02-07 16:16:56 -05:00
config	Merge remote-tracking branch 'karsten/geoip-manual-update-oct2013'	2013-10-11 11:17:25 -04:00
ext	Prepare patch for ticket 5129 for merging.	2013-08-02 09:35:24 -04:00
or	Merge remote-tracking branch 'public/no_itime_queue'	2014-02-10 15:04:23 -05:00
test	Merge remote-tracking branch 'origin/maint-0.2.4'	2014-02-07 17:41:41 -05:00
tools	Make tor-gencert create 2048 bit signing keys.	2013-12-12 17:39:22 +01:00
win32	Bump version to 0.2.5.1-alpha-dev	2013-10-02 22:41:41 -04:00
include.am	Move all externally maintained source files into src/ext	2012-10-11 17:22:03 -04:00