commit 19a81ef02026f7422e561032a6c2d5077a22488e Merge: e62ea8f 81cd3d7 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 28 15:52:57 2012 -0400

Merge commit '81cd3d7ad641a8dbf'

ChangeLog | 39 ++++++++++++++++++++++++++------------- changes/bug5238 | 4 ---- changes/bug6244 | 4 ---- changes/bug6244_part2 | 4 ---- src/common/util.c | 2 +- src/or/circuitbuild.c | 2 +- 6 files changed, 28 insertions(+), 27 deletions(-)