commit deee0b67c3171cf4a6c7cf9c64c642d882b39880 Merge: 0012054 8284c2b Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 6 10:12:11 2012 -0400

Merge remote-tracking branch 'asn/bug6765'

src/or/connection_or.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)