Nick Mathewson 35e19b9498 Merge remote-tracking branch 'origin/maint-0.2.3' %!s(int64=13) %!d(string=hai) anos
..
bug6341 5ade278605 Check ewma_enabled before doing circ-has-become-inactive check %!s(int64=13) %!d(string=hai) anos
bug6538 07df4dd52d Refactor the core of choosing by weights into a function %!s(int64=13) %!d(string=hai) anos
bug6811 973c18bf0e Fix assertion failure in tor_timegm. %!s(int64=13) %!d(string=hai) anos
bug6819 4aff97cfc7 6819: typo in torrc.sample.in %!s(int64=13) %!d(string=hai) anos