Nick Mathewson f067067ee6 Merge branch 'bug2474' ...

Had to resolve conflicts wrt the " (using bufferevents)" addition to the
startup string.

Conflicts:
	src/or/main.c

2011-11-23 17:14:54 -05:00

..

bug2474

Tweak the startup message to be more helpful

2011-04-28 22:00:22 -04:00

bug4230

Correct the handling of overflow behavior in smartlist_ensure_capacity

2011-11-09 14:48:52 -05:00