9 Commits

Author	SHA1	Message	Date
Nick Mathewson	03ccce6d77	Merge remote-tracking branch 'origin/maint-0.2.2'	2011-05-16 14:50:53 -04:00
Nick Mathewson	e908e3a332	Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 ... Fixed trivial conflict due to headers moving into their own .h files from or.h. Conflicts: src/or/or.h	2011-05-16 14:49:55 -04:00
Nick Mathewson	32918e954f	Merge remote-tracking branch 'origin/maint-0.2.2' ... Conflicts: src/or/rendcommon.h	2011-04-28 15:57:27 -04:00
Sebastian Hahn	4b13ebd5ab	Merge branch 'bug3k_021' into bug3k_022 ... Conflicts: src/or/or.h src/or/rendclient.c	2011-04-28 19:00:34 +02:00
Roger Dingledine	d3836b02cc	change APIs slightly to make #1944 easier	2011-02-07 06:39:21 -05:00
Nick Mathewson	30b3475e6d	Bump copyright statements to 2011 (0.2.2)	2011-01-03 11:52:09 -05:00
Nick Mathewson	b5e293afe6	Merge remote branch fix_security_bug_021 into fix_security_bug_022 ... Conflicts: src/common/memarea.c src/or/or.h src/or/rendclient.c	2010-12-15 22:48:23 -05:00
Linus Nordberg	da49a7267f	Fix typos, make all \brief's conformant, end sentences with a period.	2010-07-28 17:42:33 +02:00
Sebastian Hahn	31e81439e1	Create rendcommon.h	2010-07-27 07:56:25 +02:00