commit 0b536469ee8a6d437cd939cbcdaa56039e27cdcb Merge: 4bbd6a2 76d0d62 Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 24 16:48:38 2011 -0400

Merge remote-tracking branch 'rransom-tor/bug3456'

src/or/or.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)