commit 8828794dc295e3d40dbc35cd58f4c449c632085b Merge: 65575b0 f8248ab Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 30 20:23:22 2014 -0400

Merge remote-tracking branch 'public/bug10849_023_bruteforce' into maint-0.2.3

changes/bug10849_023 | 6 ++++++ src/or/config.c | 4 ++++ 2 files changed, 10 insertions(+)