diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-21 08:38:21 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-21 08:38:21 -0400 |
| commit | 72a5ae8c667fac09a639c46a145c9612424ef301 (patch) | |
| tree | 180cb720148736fde8f70260418b1292402cff7f /src/or | |
| parent | 683776bfab21ec48d967d8589412f81c6b39afe6 (diff) | |
| parent | 73bc863822bc58adaafc4017c25acaff0ecb43c1 (diff) | |
| download | tor-72a5ae8c667fac09a639c46a145c9612424ef301.tar.gz tor-72a5ae8c667fac09a639c46a145c9612424ef301.zip | |
Merge branch 'maint-0.3.4'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/control.c | 1 | ||||
| -rw-r--r-- | src/or/geoip.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c index 9e7c792b2b..0460463d78 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -7786,3 +7786,4 @@ control_testing_set_global_event_mask(uint64_t mask) global_event_mask = mask; } #endif /* defined(TOR_UNIT_TESTS) */ + diff --git a/src/or/geoip.c b/src/or/geoip.c index 8c6afe1c91..634ee707b4 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -1884,3 +1884,4 @@ geoip_free_all(void) memset(geoip_digest, 0, sizeof(geoip_digest)); memset(geoip6_digest, 0, sizeof(geoip6_digest)); } + |