Nick Mathewson b998431a33 Merge branch '024_msvc_squashed' ...

Conflicts:
	src/or/or.h
	 srcwin32/orconfig.h

2013-01-16 22:32:12 -05:00

..

common

Merge branch '024_msvc_squashed'

2013-01-16 22:32:12 -05:00

config

Merge remote-tracking branch 'origin/maint-0.2.3'

2013-01-14 14:24:53 -05:00

ext

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

or

Merge branch '024_msvc_squashed'

2013-01-16 22:32:12 -05:00

test

Merge branch '024_msvc_squashed'

2013-01-16 22:32:12 -05:00

tools

Actually link against nacl when we want to use it

2013-01-16 13:07:52 -05:00

win32

Merge branch '024_msvc_squashed'

2013-01-16 22:32:12 -05:00

include.am

Move all externally maintained source files into src/ext

2012-10-11 17:22:03 -04:00