summaryrefslogtreecommitdiff
path: root/src/or/rendcommon.h
AgeCommit message (Collapse)Author
2011-05-16Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-05-16Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
Fixed trivial conflict due to headers moving into their own .h files from or.h. Conflicts: src/or/or.h
2011-04-28Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/rendcommon.h
2011-04-28Merge branch 'bug3k_021' into bug3k_022Sebastian Hahn
Conflicts: src/or/or.h src/or/rendclient.c
2011-02-07change APIs slightly to make #1944 easierRoger Dingledine
2011-01-03Bump copyright statements to 2011 (0.2.2)Nick Mathewson
2010-12-15Merge remote branch fix_security_bug_021 into fix_security_bug_022Nick Mathewson
Conflicts: src/common/memarea.c src/or/or.h src/or/rendclient.c
2010-07-28Fix typos, make all \brief's conformant, end sentences with a period.Linus Nordberg
2010-07-27Create rendcommon.hSebastian Hahn