Merge branch 'maint-0.3.1'

Resolve conflict with 23532 code.
This commit is contained in:
Nick Mathewson
2017-09-15 14:40:35 -04:00
4 changed files with 9 additions and 5 deletions
+4
View File
@@ -0,0 +1,4 @@
o Minor bugfixes (relay):
- Inform the geoip and rephist modules about all requests, even
on relays that are only fetching microdescriptors. Fixes a bug related
to 21585; bugfix on 0.3.0.1-alpha.