commit b350ac0860f461028a373a7ff6ce5c1468ef75a6 Merge: 472696e d5558f0 Author: Roger Dingledine <arma@torproject.org> Date: Fri Jul 25 12:15:47 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 Conflicts: src/or/or.h changes/prop221 | 6 ++++++ 1 file changed, 6 insertions(+)