commit 8cd5a3c1865c2115d88b08041a27e2cfdd7d24d2 Merge: 96da10a 9e3fc5f Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jun 6 16:20:22 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3306 | 9 +++++++++ src/common/crypto.c | 5 +++-- src/or/circuitbuild.c | 10 +++++++++- 3 files changed, 21 insertions(+), 3 deletions(-)