commit f634228a073965195c4088b66c1d5c4799c6eed2 Merge: 11221d0 6e6a661 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 24 22:59:37 2011 -0500

Merge remote-tracking branch 'public/feature4516'

changes/UserspaceIOCPBuffers | 7 +++++++ src/or/config.c | 1 + src/or/main.c | 28 ++++++++++++++++++++++++++++ src/or/or.h | 5 +++++ 4 files changed, 41 insertions(+), 0 deletions(-)