Nick Mathewson 87fb1e324c Merge remote-tracking branch 'public/bug10169_024' into bug10169_025_v2 ...

Conflicts:
	src/or/circuitlist.c

2014-02-12 12:44:58 -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/bug10169_024' into bug10169_025_v2

2014-02-12 12:44:58 -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